--- a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
@@ -65,18 +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_AddonRepository.js",
-  "test_AddonRepository_cache.js",
   "test_blocklistchange.js",
   "test_bug335238.js",
   "test_bug397778.js",
   "test_bug425657.js",
   "test_bug455906.js",
   "test_bug470377_1.js",
   "test_bug470377_2.js",
   "test_bug470377_3.js",

--- a/toolkit/mozapps/extensions/test/xpcshell/test_AddonRepository.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_AddonRepository.js
@@ -14,16 +14,17 @@ const PREF_GETADDONS_BROWSESEARCHRESULTS
 const PORT          = gServer.identity.primaryPort;
 const BASE_URL      = "http://localhost:" + PORT;
 const DEFAULT_URL   = "about:blank";
 
 const ADDONS = [
   {
     id: "test_AddonRepository_1@tests.mozilla.org",
     version: "1.1",
+    bootstrap: true,
 
     name: "XPI Add-on 1",
     description: "XPI Add-on 1 - Description",
     creator: "XPI Add-on 1 - Creator",
     developer: ["XPI Add-on 1 - First Developer",
                 "XPI Add-on 1 - Second Developer"],
     translator: ["XPI Add-on 1 - First Translator",
                  "XPI Add-on 1 - Second Translator"],
@@ -39,28 +40,30 @@ const ADDONS = [
       minVersion: "1",
       maxVersion: "1"}],
   },
   {
     id: "test_AddonRepository_2@tests.mozilla.org",
     type: 4,
     internalName: "test2/1.0",
     version: "1.2",
+    bootstrap: true,
     name: "XPI Add-on 2",
 
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "1"}],
   },
   {
     id: "test_AddonRepository_3@tests.mozilla.org",
     type: "4",
     internalName: "test3/1.0",
     version: "1.3",
+    bootstrap: true,
     name: "XPI Add-on 3",
 
     targetApplications: [{
       id: "xpcshell@tests.mozilla.org",
       minVersion: "1",
       maxVersion: "1"}],
   },
 ];

--- a/toolkit/mozapps/extensions/test/xpcshell/test_AddonRepository_cache.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_AddonRepository_cache.js
@@ -20,16 +20,17 @@ const FAILED_RESULT                = BAS
 
 const FILE_DATABASE = "addons.json";
 
 const ADDONS = [
   {
     "install.rdf": {
       id: "test_AddonRepository_1@tests.mozilla.org",
       version: "1.1",
+      bootstrap: true,
 
       name: "XPI Add-on 1",
       description: "XPI Add-on 1 - Description",
       creator: "XPI Add-on 1 - Creator",
       developer: ["XPI Add-on 1 - First Developer",
                   "XPI Add-on 1 - Second Developer"],
       translator: ["XPI Add-on 1 - First Translator",
                    "XPI Add-on 1 - Second Translator"],
@@ -47,30 +48,32 @@ const ADDONS = [
     },
   },
   {
     "install.rdf": {
       id: "test_AddonRepository_2@tests.mozilla.org",
       type: 4,
       internalName: "test2/1.0",
       version: "1.2",
+      bootstrap: true,
       name: "XPI Add-on 2",
 
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",
         maxVersion: "1"}],
     },
   },
   {
     "install.rdf": {
       id: "test_AddonRepository_3@tests.mozilla.org",
       type: "4",
       internalName: "test3/1.0",
       version: "1.3",
+      bootstrap: true,
       name: "XPI Add-on 3",
 
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",
         maxVersion: "1"}],
     },
     "icon.png": "",