--- basilisk.old/platform/testing/mozbase/mozprofile/mozprofile/profile.py
+++ basilisk/platform/testing/mozbase/mozprofile/mozprofile/profile.py
@@ -369,9 +369,9 @@
         'extensions.autoDisableScopes': 10,
         # Don't send the list of installed addons to AMO
         'extensions.getAddons.cache.enabled': False,
-        # Don't install distribution add-ons from the app folder
-        'extensions.installDistroAddons': False,
-        # Dont' run the add-on compatibility check during start-up
+        # Do install distribution add-ons from the app folder
+        'extensions.installDistroAddons': True,
+        # Don't run the add-on compatibility check during start-up
         'extensions.showMismatchUI': False,
         # Don't automatically update add-ons
         'extensions.update.enabled': False,
@@ -416,9 +416,9 @@
         'extensions.autoDisableScopes': 10,
         # Don't send the list of installed addons to AMO
         'extensions.getAddons.cache.enabled': False,
-        # Don't install distribution add-ons from the app folder
-        'extensions.installDistroAddons': False,
-        # Dont' run the add-on compatibility check during start-up
+        # Do install distribution add-ons from the app folder
+        'extensions.installDistroAddons': True,
+        # Don't run the add-on compatibility check during start-up
         'extensions.showMismatchUI': False,
         # Disable strict compatibility checks to allow add-ons enabled by default
         'extensions.strictCompatibility': False,
--- basilisk.old/platform/testing/profiles/prefs_general.js
+++ basilisk/platform/testing/profiles/prefs_general.js
@@ -79,7 +79,7 @@
 // Disable metadata caching for installed add-ons by default
 user_pref("extensions.getAddons.cache.enabled", false);
 // Disable intalling any distribution add-ons
-user_pref("extensions.installDistroAddons", false);
+user_pref("extensions.installDistroAddons", true);
 // XPI extensions are required for test harnesses to load
 user_pref("extensions.defaultProviders.enabled", true);
 user_pref("xpinstall.signatures.required", false);
--- basilisk.old/basilisk/app/profile/basilisk.js
+++ basilisk/basilisk/app/profile/basilisk.js
@@ -60,7 +60,7 @@
 
 // Disable add-ons that are not installed by the user in all scopes by default.
 // See the SCOPE constants in AddonManager.jsm for values to use here.
-pref("extensions.autoDisableScopes", 15);
+pref("extensions.autoDisableScopes", 11);
 
 // Add-on content security policies.
 pref("extensions.webextensions.base-content-security-policy", "script-src 'self' https://* moz-extension: blob: filesystem: 'unsafe-eval' 'unsafe-inline'; object-src 'self' https://* moz-extension: blob: filesystem:;");
--- basilisk.old/platform/layout/tools/reftest/reftest-preferences.js
+++ basilisk/platform/layout/tools/reftest/reftest-preferences.js
@@ -88,7 +88,7 @@
 // Only allow add-ons from the profile and app and allow foreign
 // injection
 user_pref("extensions.enabledScopes", 5);
-user_pref("extensions.autoDisableScopes", 0);
+user_pref("extensions.autoDisableScopes", 11);
 // Allow unsigned add-ons
 user_pref("xpinstall.signatures.required", false);
 
--- basilisk.old/platform/testing/mozbase/mozprofile/mozprofile/profile.py
+++ basilisk/platform/testing/mozbase/mozprofile/mozprofile/profile.py
@@ -366,7 +366,7 @@
         # Also ensure that those are not getting disabled.
         # see: https://developer.mozilla.org/en/Installing_extensions
         'extensions.enabledScopes': 5,
-        'extensions.autoDisableScopes': 10,
+        'extensions.autoDisableScopes': 11,
         # Don't send the list of installed addons to AMO
         'extensions.getAddons.cache.enabled': False,
         # Do install distribution add-ons from the app folder
@@ -413,7 +413,7 @@
         # Also ensure that those are not getting disabled.
         # see: https://developer.mozilla.org/en/Installing_extensions
         'extensions.enabledScopes': 5,
-        'extensions.autoDisableScopes': 10,
+        'extensions.autoDisableScopes': 11,
         # Don't send the list of installed addons to AMO
         'extensions.getAddons.cache.enabled': False,
         # Do install distribution add-ons from the app folder
--- basilisk.old/platform/testing/profiles/prefs_general.js
+++ basilisk/platform/testing/profiles/prefs_general.js
@@ -75,7 +75,7 @@
 // Only load extensions from the application and user profile
 // AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_APPLICATION
 user_pref("extensions.enabledScopes", 5);
-user_pref("extensions.autoDisableScopes", 0);
+user_pref("extensions.autoDisableScopes", 11);
 // Disable metadata caching for installed add-ons by default
 user_pref("extensions.getAddons.cache.enabled", false);
 // Disable intalling any distribution add-ons
--- basilisk.old/platform/testing/talos/talos/config.py
+++ basilisk/platform/testing/talos/talos/config.py
@@ -79,7 +79,7 @@
         'dom.disable_window_move_resize': True,
         'dom.max_chrome_script_run_time': 0,
         'dom.max_script_run_time': 0,
-        'extensions.autoDisableScopes': 10,
+        'extensions.autoDisableScopes': 11,
         'extensions.checkCompatibility': False,
         'extensions.enabledScopes': 5,
         'extensions.update.notifyUser': False,
--- basilisk.old/platform/testing/tps/tps/testrunner.py
+++ basilisk/platform/testing/tps/tps/testrunner.py
@@ -63,7 +63,7 @@
         'browser.tabs.warnOnClose': False,
         'browser.warnOnQuit': False,
         # Allow installing extensions dropped into the profile folder
-        'extensions.autoDisableScopes': 10,
+        'extensions.autoDisableScopes': 11,
         'extensions.getAddons.get.url': 'http://127.0.0.1:4567/addons/api/%IDS%.xml',
         # Our pretend addons server doesn't support metadata...
         'extensions.getAddons.cache.enabled': False,