--- a/toolkit/mozapps/extensions/internal/E10SAddonsRollout.jsm
+++ b/toolkit/mozapps/extensions/internal/E10SAddonsRollout.jsm
@@ -49,16 +49,51 @@ const ADDONS = {
   "PersonasPlus": { // PersonasPlus
     id: "personas@christopher.beard", minVersion: "1.8.0",
   },
 
   "ACR": { // Add-on Compatibility Reporter
     id: "compatibility@addons.mozilla.org", minVersion: "2.2.0",
   },
 
+  // Test Pilot add-ons for Firefox 49
+  "TestPilot": { // Test Pilot Addon
+    id: "@testpilot-addon", minVersion: "0.8.5",
+  },
+
+  "TabCenter": { // Tab Center
+    id: "tabcentertest1@mozilla.com", minVersion: "1.24",
+  },
+
+  "ActivityStream": { // Activity Stream
+    id: "@activity-streams", minVersion: "1.1.3",
+  },
+
+  "PageShot": { // Page Shot
+    id: "jid1-NeEaf3sAHdKHPA@jetpack", minVersion: "0.0.1",
+  },
+
+  "MinVid": { // Min Vid
+    id: "@min-vid", minVersion: "0.0.1",
+  },
+
+  "TrackingProtection": { // Tracking Protection Web Extension
+    id: "blok@mozilla.org", minVersion: "1.0.0",
+  },
+
+  "NoMore404s": { // No More 404s Web Extension
+    id: "wayback_machine@mozilla.org", minVersion: "1.5.6",
+  },
+
+  "UniversalSearch": { // Universal Search Extension
+    id: "universal-search@mozilla.com", minVersion: "1.0.10",
+  },
+
+  // (ENDS) Test Pilot add-ons for Firefox 49
+
   // Add-ons used for testing
   "test1": {
     id: "bootstrap1@tests.mozilla.org", minVersion: "1.0",
   },
 
   "test2": {
     id: "bootstrap2@tests.mozilla.org", minVersion: "1.0",
   },
@@ -97,32 +132,55 @@ const set49Release = [
 const set49PaneOnly = [
   ADDONS.ABP,
   ADDONS.VDH,
   ADDONS.Emoji,
   ADDONS.ASP,
   ADDONS.ACR
 ]
 
+// Main Test Pilot add-on for Firefox 49
+const setTestPilot49 = [
+  ADDONS.TestPilot
+]
+
+// Main Test Pilot add-on + test add-ons for Firefox 49
+const setTestPilotAddons49 = [
+  ADDONS.TestPilot,
+  ADDONS.TabCenter,
+  ADDONS.ActivityStream,
+  ADDONS.MinVid,
+  ADDONS.PageShot,
+  ADDONS.TrackingProtection,
+  ADDONS.NoMore404s,
+  ADDONS.UniversalSearch,
+]
+
 // We use these named policies to correlate the telemetry
 // data with them, in order to understand how each set
 // is behaving in the wild.
 const RolloutPolicy = {
   // Used during 48 Beta cycle
   "2a": { addons: set2, webextensions: true },
   "2b": { addons: set2, webextensions: false },
 
   // Set agreed for Release 49
   "49a": { addons: set49Release, webextensions: true },
   "49b": { addons: set49Release, webextensions: false },
 
   // Smaller set that can be used for Release 49
   "49limiteda": { addons: set49PaneOnly, webextensions: true },
   "49limitedb": { addons: set49PaneOnly, webextensions: false },
 
+  "49testpilotaddonsa": { addons: [...set49Release, ...setTestPilotAddons49], webextensions: true },
+  "49testpilotaddonsb": { addons: [...set49Release, ...setTestPilotAddons49], webextensions: false },
+
+  "49testpilota": { addons: [...set49Release, ...setTestPilot49], webextensions: true },
+  "49testpilotb": { addons: [...set49Release, ...setTestPilot49], webextensions: false },
+
   "xpcshell-test": { addons: [ADDONS.test1, ADDONS.test2], webextensions: false },
 };
 
 Object.defineProperty(this, "isAddonPartOfE10SRollout", {
   configurable: false,
   enumerable: false,
   writable: false,
   value: function isAddonPartOfE10SRollout(aAddon) {