--- a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
@@ -98,17 +98,16 @@ const LEGACY_NON_RESTARTLESS_TESTS = new
   "test_checkcompatibility.js",
   "test_compatoverrides.js",
   "test_dataDirectory.js",
   "test_distribution.js",
   "test_error.js",
   "test_filepointer.js",
   "test_invalid_install_rdf.js",
   "test_locale.js",
-  "test_manifest.js",
   "test_onPropertyChanged_appDisabled.js",
   "test_proxies.js",
   "test_safemode.js",
   "test_sideloads.js",
   "test_signed_verify.js",
   "test_softblocked.js",
   "test_sourceURI.js",
   "test_strictcompatibility.js",

--- a/toolkit/mozapps/extensions/test/xpcshell/test_manifest.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_manifest.js
@@ -6,16 +6,17 @@
 // items are correctly enabled/disabled based on them (blocklist tests are
 // elsewhere)
 
 const ADDONS = [
   {
     "install.rdf": {
       id: "addon1@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       aboutURL: "chrome://test/content/about.xul",
       iconURL: "chrome://test/skin/icon.png",
       icon64URL: "chrome://test/skin/icon64.png",
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",
         maxVersion: "1"
       }],
@@ -61,16 +62,17 @@ const ADDONS = [
       blocklistState: AM_Ci.nsIBlocklistService.STATE_NOT_BLOCKED,
     },
   },
 
   {
     "install.rdf": {
       id: "addon2@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       updateURL: "https://www.foo.com",
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",
         maxVersion: "1"
       }],
       name: "Test Addon 2"
     },
@@ -83,16 +85,17 @@ const ADDONS = [
       providesUpdatesSecurely: true,
     },
   },
 
   {
     "install.rdf": {
       id: "addon3@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       updateURL: "http://www.foo.com",
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",
         maxVersion: "1"
       }],
       name: "Test Addon 3"
     },
@@ -105,16 +108,17 @@ const ADDONS = [
       providesUpdatesSecurely: false,
     },
   },
 
   {
     "install.rdf": {
       id: "addon4@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       updateURL: "http://www.foo.com",
       updateKey: "foo",
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",
         maxVersion: "1"
       }],
       name: "Test Addon 4"
@@ -128,16 +132,17 @@ const ADDONS = [
       providesUpdatesSecurely: false,
     },
   },
 
   {
     "install.rdf": {
       id: "addon5@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",
         maxVersion: "*"
       }],
       name: "Test Addon 5"
     },
 
@@ -148,16 +153,17 @@ const ADDONS = [
       isCompatible: true,
     },
   },
 
   {
     "install.rdf": {
       id: "addon6@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "0",
         maxVersion: "1"
       }],
       name: "Test Addon 6"
     },
 
@@ -168,16 +174,17 @@ const ADDONS = [
       isCompatible: true,
     },
   },
 
   {
     "install.rdf": {
       id: "addon7@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "0",
         maxVersion: "0"
       }],
       name: "Test Addon 7"
     },
 
@@ -188,16 +195,17 @@ const ADDONS = [
       isCompatible: false,
     },
   },
 
   {
     "install.rdf": {
       id: "addon8@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1.1",
         maxVersion: "*"
       }],
       name: "Test Addon 8"
     },
 
@@ -208,16 +216,17 @@ const ADDONS = [
       isCompatible: false,
     },
   },
 
   {
     "install.rdf": {
       id: "addon9@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       targetApplications: [{
         id: "toolkit@mozilla.org",
         minVersion: "1.9.2",
         maxVersion: "1.9.*"
       }],
       name: "Test Addon 9"
     },
 
@@ -228,16 +237,17 @@ const ADDONS = [
       isCompatible: true,
     },
   },
 
   {
     "install.rdf": {
       id: "addon10@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       targetApplications: [{
         id: "toolkit@mozilla.org",
         minVersion: "1.9.2.1",
         maxVersion: "1.9.*"
       }],
       name: "Test Addon 10"
     },
 
@@ -248,16 +258,17 @@ const ADDONS = [
       isCompatible: false,
     },
   },
 
   {
     "install.rdf": {
       id: "addon11@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       targetApplications: [{
         id: "toolkit@mozilla.org",
         minVersion: "1.9",
         maxVersion: "1.9.2"
       }],
       name: "Test Addon 11"
     },
 
@@ -268,16 +279,17 @@ const ADDONS = [
       isCompatible: true,
     },
   },
 
   {
     "install.rdf": {
       id: "addon12@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       targetApplications: [{
         id: "toolkit@mozilla.org",
         minVersion: "1.9",
         maxVersion: "1.9.1.*"
       }],
       name: "Test Addon 12"
     },
 
@@ -288,16 +300,17 @@ const ADDONS = [
       isCompatible: false,
     },
   },
 
   {
     "install.rdf": {
       id: "addon13@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       targetApplications: [{
         id: "toolkit@mozilla.org",
         minVersion: "1.9",
         maxVersion: "1.9.*"
       }, {
         id: "xpcshell@tests.mozilla.org",
         minVersion: "0",
         maxVersion: "0.5"
@@ -312,16 +325,17 @@ const ADDONS = [
       isCompatible: false,
     },
   },
 
   {
     "install.rdf": {
       id: "addon14@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       targetApplications: [{
         id: "toolkit@mozilla.org",
         minVersion: "1.9",
         maxVersion: "1.9.1"
       }, {
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",
         maxVersion: "1"
@@ -336,16 +350,17 @@ const ADDONS = [
       isCompatible: true,
     },
   },
 
   {
     "install.rdf": {
       id: "addon15@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       updateKey: "foo",
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",
         maxVersion: "1"
       }],
       name: "Test Addon 15"
     },
@@ -358,16 +373,17 @@ const ADDONS = [
       providesUpdatesSecurely: true,
     },
   },
 
   {
     "install.rdf": {
       id: "addon16@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       updateKey: "foo",
       updateURL: "https://www.foo.com",
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",
         maxVersion: "1"
       }],
       name: "Test Addon 16"
@@ -381,16 +397,17 @@ const ADDONS = [
       providesUpdatesSecurely: true,
     },
   },
 
   {
     "install.rdf": {
       id: "addon17@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       optionsURL: "chrome://test/content/options.xul",
       optionsType: "2",
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",
         maxVersion: "1"
       }],
       name: "Test Addon 17"
@@ -399,16 +416,17 @@ const ADDONS = [
     // An obsolete optionsType means the add-on isn't registered.
     expected: null,
   },
 
   {
     "install.rdf": {
       id: "addon18@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",
         maxVersion: "1"
       }],
       name: "Test Addon 18"
     },
     extraFiles: {"options.xul": ""},
@@ -422,32 +440,34 @@ const ADDONS = [
       optionsType: null,
     },
   },
 
   {
     "install.rdf": {
       id: "addon19@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       optionsType: "99",
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",
         maxVersion: "1"
       }],
       name: "Test Addon 19"
     },
 
     expected: null,
   },
 
   {
     "install.rdf": {
       id: "addon20@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       optionsURL: "chrome://test/content/options.xul",
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",
         maxVersion: "1"
       }],
       name: "Test Addon 20"
     },
@@ -462,16 +482,17 @@ const ADDONS = [
       optionsType: null,
     },
   },
 
   {
     "install.rdf": {
       id: "addon21@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       optionsType: "3",
       optionsURL: "chrome://test/content/options.xul",
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",
         maxVersion: "1"
       }],
       name: "Test Addon 21"
@@ -486,16 +507,17 @@ const ADDONS = [
       optionsType: AddonManager.OPTIONS_TYPE_TAB,
     },
   },
 
   {
     "install.rdf": {
       id: "addon22@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       optionsType: "2",
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",
         maxVersion: "1"
       }],
       name: "Test Addon 22"
     },
@@ -503,16 +525,17 @@ const ADDONS = [
     // An obsolete optionsType means the add-on isn't registered.
     expected: null,
   },
 
   {
     "install.rdf": {
       id: "addon23@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       optionsType: "2",
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",
         maxVersion: "1"
       }],
       name: "Test Addon 23"
     },
@@ -521,16 +544,17 @@ const ADDONS = [
     // An obsolete optionsType means the add-on isn't registered.
     expected: null,
   },
 
   {
     "install.rdf": {
       id: "addon24@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",
         maxVersion: "1"
       }],
       name: "Test Addon 24"
     },
     extraFiles: {"options.xul": ""},
@@ -540,16 +564,17 @@ const ADDONS = [
       optionsURL: null,
     },
   },
 
   {
     "install.rdf": {
       id: "addon25@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       optionsType: "3",
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",
         maxVersion: "1"
       }],
       name: "Test Addon 25"
     },
@@ -559,16 +584,17 @@ const ADDONS = [
       optionsURL: null,
     },
   },
 
   {
     "install.rdf": {
       id: "addon26@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       optionsType: "4",
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",
         maxVersion: "1"
       }],
       name: "Test Addon 26"
     },
@@ -579,16 +605,17 @@ const ADDONS = [
 
   // Tests compatibility based on target platforms.
 
   // No targetPlatforms so should be compatible
   {
     "install.rdf": {
       id: "tp-addon1@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       name: "Test 1",
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",
         maxVersion: "1"
       }]
     },
 
@@ -599,16 +626,17 @@ const ADDONS = [
     },
   },
 
   // Matches the OS
   {
     "install.rdf": {
       id: "tp-addon2@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       name: "Test 2",
       targetPlatforms: [
         "XPCShell",
         "WINNT_x86",
         "XPCShell"
       ],
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
@@ -624,16 +652,17 @@ const ADDONS = [
     },
   },
 
   // Matches the OS and ABI
   {
     "install.rdf": {
       id: "tp-addon3@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       name: "Test 3",
       targetPlatforms: [
         "WINNT",
         "XPCShell_noarch-spidermonkey"
       ],
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",
@@ -648,16 +677,17 @@ const ADDONS = [
     },
   },
 
   // Doesn't match
   {
     "install.rdf": {
       id: "tp-addon4@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       name: "Test 4",
       targetPlatforms: [
         "WINNT_noarch-spidermonkey",
         "Darwin",
         "WINNT_noarch-spidermonkey"
       ],
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
@@ -673,16 +703,17 @@ const ADDONS = [
     },
   },
 
   // Matches the OS but since a different entry specifies ABI this doesn't match.
   {
     "install.rdf": {
       id: "tp-addon5@tests.mozilla.org",
       version: "1.0",
+      bootstrap: true,
       name: "Test 5",
       targetPlatforms: [
         "XPCShell",
         "XPCShell_foo"
       ],
       targetApplications: [{
         id: "xpcshell@tests.mozilla.org",
         minVersion: "1",