--- a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
@@ -65,17 +65,16 @@ ChromeUtils.defineModuleGetter(this, "Mo
                                "resource://testing-common/MockRegistry.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(this, "aomStartup",
                                    "@mozilla.org/addons/addon-manager-startup;1",
                                    "amIAddonManagerStartup");
 
 // Whitelist existing tests that still use non-restartless extensions.
 const LEGACY_NON_RESTARTLESS_TESTS = new Set([
-  "test_blocklistchange.js",
   "test_bug455906.js",
 ]);
 
 if (LEGACY_NON_RESTARTLESS_TESTS.has(_TEST_FILE[0].replace(/.*\//, ""))) {
   Services.prefs.setBoolPref("extensions.legacy.non-restartless.enabled", true);
 }
 
 const {

--- a/toolkit/mozapps/extensions/test/xpcshell/test_blocklistchange.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_blocklistchange.js
@@ -36,198 +36,219 @@ gPort = testserver.identity.primaryPort;
 
 testserver.registerDirectory("/data/", do_get_file("data"));
 
 const ADDONS = {
   "blocklist_hard1_1": {
     id: "hardblock@tests.mozilla.org",
     version: "1.0",
     name: "Hardblocked add-on",
+    bootstrap: true,
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "3"}],
   },
   "blocklist_hard1_2": {
     id: "hardblock@tests.mozilla.org",
     version: "2.0",
     name: "Hardblocked add-on",
+    bootstrap: true,
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "3"}],
   },
   "blocklist_hard1_3": {
     id: "hardblock@tests.mozilla.org",
     version: "3.0",
     name: "Hardblocked add-on",
+    bootstrap: true,
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "3"}],
   },
   "blocklist_regexp1_1": {
     id: "regexpblock@tests.mozilla.org",
     version: "1.0",
     name: "RegExp-blocked add-on",
+    bootstrap: true,
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "3"}],
   },
   "blocklist_regexp1_2": {
     id: "regexpblock@tests.mozilla.org",
     version: "2.0",
     name: "RegExp-blocked add-on",
+    bootstrap: true,
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "3"}],
   },
   "blocklist_regexp1_3": {
     id: "regexpblock@tests.mozilla.org",
     version: "3.0",
     name: "RegExp-blocked add-on",
+    bootstrap: true,
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "3"}],
   },
   "blocklist_soft1_1": {
     id: "softblock1@tests.mozilla.org",
     version: "1.0",
     name: "Softblocked add-on",
+    bootstrap: true,
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "3"}],
   },
   "blocklist_soft1_2": {
     id: "softblock1@tests.mozilla.org",
     version: "2.0",
     name: "Softblocked add-on",
+    bootstrap: true,
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "3"}],
   },
   "blocklist_soft1_3": {
     id: "softblock1@tests.mozilla.org",
     version: "3.0",
     name: "Softblocked add-on",
+    bootstrap: true,
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "3"}],
   },
   "blocklist_soft2_1": {
     id: "softblock2@tests.mozilla.org",
     version: "1.0",
     name: "Softblocked add-on",
+    bootstrap: true,
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "3"}],
   },
   "blocklist_soft2_2": {
     id: "softblock2@tests.mozilla.org",
     version: "2.0",
     name: "Softblocked add-on",
+    bootstrap: true,
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "3"}],
   },
   "blocklist_soft2_3": {
     id: "softblock2@tests.mozilla.org",
     version: "3.0",
     name: "Softblocked add-on",
+    bootstrap: true,
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "3"}],
   },
   "blocklist_soft3_1": {
     id: "softblock3@tests.mozilla.org",
     version: "1.0",
     name: "Softblocked add-on",
+    bootstrap: true,
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "3"}],
   },
   "blocklist_soft3_2": {
     id: "softblock3@tests.mozilla.org",
     version: "2.0",
     name: "Softblocked add-on",
+    bootstrap: true,
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "3"}],
   },
   "blocklist_soft3_3": {
     id: "softblock3@tests.mozilla.org",
     version: "3.0",
     name: "Softblocked add-on",
+    bootstrap: true,
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "3"}],
   },
   "blocklist_soft4_1": {
     id: "softblock4@tests.mozilla.org",
     version: "1.0",
     name: "Softblocked add-on",
+    bootstrap: true,
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "3"}],
   },
   "blocklist_soft4_2": {
     id: "softblock4@tests.mozilla.org",
     version: "2.0",
     name: "Softblocked add-on",
+    bootstrap: true,
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "3"}],
   },
   "blocklist_soft4_3": {
     id: "softblock4@tests.mozilla.org",
     version: "3.0",
     name: "Softblocked add-on",
+    bootstrap: true,
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "3"}],
   },
   "blocklist_soft5_1": {
     id: "softblock5@tests.mozilla.org",
     version: "1.0",
     name: "Softblocked add-on",
+    bootstrap: true,
     internalName: "test/1.0",
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "3"}],
   },
   "blocklist_soft5_2": {
     id: "softblock5@tests.mozilla.org",
     version: "2.0",
     name: "Softblocked add-on",
+    bootstrap: true,
     internalName: "test/1.0",
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "3"}],
   },
   "blocklist_soft5_3": {
     id: "softblock5@tests.mozilla.org",
     version: "3.0",
     name: "Softblocked add-on",
+    bootstrap: true,
     internalName: "test/1.0",
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "3"}],
   },
 };
 
@@ -237,220 +258,238 @@ for (let [name, manifest] of Object.entr
   XPIS[name] = createTempXPIFile(manifest);
   testserver.registerFile(`/addons/${name}.xpi`, XPIS[name]);
 }
 
 var softblock1_1 = {
   id: "softblock1@tests.mozilla.org",
   version: "1.0",
   name: "Softblocked add-on",
+  bootstrap: true,
   updateURL: "http://example.com/data/blocklistchange/addon_update1.json",
   targetApplications: [{
     id: "xpcshell@tests.mozilla.org",
     minVersion: "1",
     maxVersion: "3"
   }]
 };
 
 var softblock1_2 = {
   id: "softblock1@tests.mozilla.org",
   version: "2.0",
   name: "Softblocked add-on",
+  bootstrap: true,
   updateURL: "http://example.com/data/blocklistchange/addon_update2.json",
   targetApplications: [{
     id: "xpcshell@tests.mozilla.org",
     minVersion: "1",
     maxVersion: "3"
   }]
 };
 
 var softblock1_3 = {
   id: "softblock1@tests.mozilla.org",
   version: "3.0",
   name: "Softblocked add-on",
+  bootstrap: true,
   updateURL: "http://example.com/data/blocklistchange/addon_update3.json",
   targetApplications: [{
     id: "xpcshell@tests.mozilla.org",
     minVersion: "1",
     maxVersion: "3"
   }]
 };
 
 var softblock2_1 = {
   id: "softblock2@tests.mozilla.org",
   version: "1.0",
   name: "Softblocked add-on",
+  bootstrap: true,
   updateURL: "http://example.com/data/blocklistchange/addon_update1.json",
   targetApplications: [{
     id: "xpcshell@tests.mozilla.org",
     minVersion: "1",
     maxVersion: "3"
   }]
 };
 
 var softblock2_2 = {
   id: "softblock2@tests.mozilla.org",
   version: "2.0",
   name: "Softblocked add-on",
+  bootstrap: true,
   updateURL: "http://example.com/data/blocklistchange/addon_update2.json",
   targetApplications: [{
     id: "xpcshell@tests.mozilla.org",
     minVersion: "1",
     maxVersion: "3"
   }]
 };
 
 var softblock2_3 = {
   id: "softblock2@tests.mozilla.org",
   version: "3.0",
   name: "Softblocked add-on",
+  bootstrap: true,
   updateURL: "http://example.com/data/blocklistchange/addon_update3.json",
   targetApplications: [{
     id: "xpcshell@tests.mozilla.org",
     minVersion: "1",
     maxVersion: "3"
   }]
 };
 
 var softblock3_1 = {
   id: "softblock3@tests.mozilla.org",
   version: "1.0",
   name: "Softblocked add-on",
+  bootstrap: true,
   updateURL: "http://example.com/data/blocklistchange/addon_update1.json",
   targetApplications: [{
     id: "xpcshell@tests.mozilla.org",
     minVersion: "1",
     maxVersion: "3"
   }]
 };
 
 var softblock3_2 = {
   id: "softblock3@tests.mozilla.org",
   version: "2.0",
   name: "Softblocked add-on",
+  bootstrap: true,
   updateURL: "http://example.com/data/blocklistchange/addon_update2.json",
   targetApplications: [{
     id: "xpcshell@tests.mozilla.org",
     minVersion: "1",
     maxVersion: "3"
   }]
 };
 
 var softblock3_3 = {
   id: "softblock3@tests.mozilla.org",
   version: "3.0",
   name: "Softblocked add-on",
+  bootstrap: true,
   updateURL: "http://example.com/data/blocklistchange/addon_update3.json",
   targetApplications: [{
     id: "xpcshell@tests.mozilla.org",
     minVersion: "1",
     maxVersion: "3"
   }]
 };
 
 var softblock4_1 = {
   id: "softblock4@tests.mozilla.org",
   version: "1.0",
   name: "Softblocked add-on",
+  bootstrap: true,
   updateURL: "http://example.com/data/blocklistchange/addon_update1.json",
   targetApplications: [{
     id: "xpcshell@tests.mozilla.org",
     minVersion: "1",
     maxVersion: "3"
   }]
 };
 
 var softblock4_2 = {
   id: "softblock4@tests.mozilla.org",
   version: "2.0",
   name: "Softblocked add-on",
+  bootstrap: true,
   updateURL: "http://example.com/data/blocklistchange/addon_update2.json",
   targetApplications: [{
     id: "xpcshell@tests.mozilla.org",
     minVersion: "1",
     maxVersion: "3"
   }]
 };
 
 var softblock4_3 = {
   id: "softblock4@tests.mozilla.org",
   version: "3.0",
   name: "Softblocked add-on",
+  bootstrap: true,
   updateURL: "http://example.com/data/blocklistchange/addon_update3.json",
   targetApplications: [{
     id: "xpcshell@tests.mozilla.org",
     minVersion: "1",
     maxVersion: "3"
   }]
 };
 
 var hardblock_1 = {
   id: "hardblock@tests.mozilla.org",
   version: "1.0",
   name: "Hardblocked add-on",
+  bootstrap: true,
   updateURL: "http://example.com/data/blocklistchange/addon_update1.json",
   targetApplications: [{
     id: "xpcshell@tests.mozilla.org",
     minVersion: "1",
     maxVersion: "3"
   }]
 };
 
 var hardblock_2 = {
   id: "hardblock@tests.mozilla.org",
   version: "2.0",
   name: "Hardblocked add-on",
+  bootstrap: true,
   updateURL: "http://example.com/data/blocklistchange/addon_update2.json",
   targetApplications: [{
     id: "xpcshell@tests.mozilla.org",
     minVersion: "1",
     maxVersion: "3"
   }]
 };
 
 var hardblock_3 = {
   id: "hardblock@tests.mozilla.org",
   version: "3.0",
   name: "Hardblocked add-on",
+  bootstrap: true,
   updateURL: "http://example.com/data/blocklistchange/addon_update3.json",
   targetApplications: [{
     id: "xpcshell@tests.mozilla.org",
     minVersion: "1",
     maxVersion: "3"
   }]
 };
 
 var regexpblock_1 = {
   id: "regexpblock@tests.mozilla.org",
   version: "1.0",
   name: "RegExp-blocked add-on",
+  bootstrap: true,
   updateURL: "http://example.com/data/blocklistchange/addon_update1.json",
   targetApplications: [{
     id: "xpcshell@tests.mozilla.org",
     minVersion: "1",
     maxVersion: "3"
   }]
 };
 
 var regexpblock_2 = {
   id: "regexpblock@tests.mozilla.org",
   version: "2.0",
   name: "RegExp-blocked add-on",
+  bootstrap: true,
   updateURL: "http://example.com/data/blocklistchange/addon_update2.json",
   targetApplications: [{
     id: "xpcshell@tests.mozilla.org",
     minVersion: "1",
     maxVersion: "3"
   }]
 };
 
 var regexpblock_3 = {
   id: "regexpblock@tests.mozilla.org",
   version: "3.0",
   name: "RegExp-blocked add-on",
+  bootstrap: true,
   updateURL: "http://example.com/data/blocklistchange/addon_update3.json",
   targetApplications: [{
     id: "xpcshell@tests.mozilla.org",
     minVersion: "1",
     maxVersion: "3"
   }]
 };