--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -69,29 +69,16 @@ support-files =
   title_test.svg
   unknownContentType_file.pif
   unknownContentType_file.pif^headers^
   video.ogg
   web_video.html
   web_video1.ogv
   web_video1.ogv^headers^
   zoom_test.html
-  file_install_extensions.html
-  browser_legacy.xpi
-  browser_legacy_webext.xpi
-  browser_webext_permissions.xpi
-  browser_webext_nopermissions.xpi
-  browser_webext_update1.xpi
-  browser_webext_update2.xpi
-  browser_webext_update_icon1.xpi
-  browser_webext_update_icon2.xpi
-  browser_webext_update_perms1.xpi
-  browser_webext_update_perms2.xpi
-  browser_webext_update.json
-  browser_webext_search.xml
   !/image/test/mochitest/blue.png
   !/toolkit/content/tests/browser/common/mockTransfer.js
   !/toolkit/modules/tests/browser/metadata_*.html
   !/toolkit/mozapps/extensions/test/xpinstall/amosigned.xpi
   !/toolkit/mozapps/extensions/test/xpinstall/corrupt.xpi
   !/toolkit/mozapps/extensions/test/xpinstall/incompatible.xpi
   !/toolkit/mozapps/extensions/test/xpinstall/installtrigger.html
   !/toolkit/mozapps/extensions/test/xpinstall/redirect.sjs
@@ -251,20 +238,16 @@ skip-if = !datareporting
 [browser_decoderDoctor.js]
 skip-if = os == "mac" # decoder doctor isn't implemented on osx
 [browser_discovery.js]
 [browser_double_close_tab.js]
 [browser_documentnavigation.js]
 [browser_duplicateIDs.js]
 [browser_drag.js]
 skip-if = true # browser_drag.js is disabled, as it needs to be updated for the new behavior from bug 320638.
-[browser_extension_permissions.js]
-[browser_extension_sideloading.js]
-[browser_extension_update_background.js]
-[browser_extension_update_interactive.js]
 [browser_favicon_change.js]
 [browser_favicon_change_not_in_document.js]
 [browser_findbarClose.js]
 [browser_focusonkeydown.js]
 [browser_fullscreen-window-open.js]
 tags = fullscreen
 skip-if = os == "linux" # Linux: Intermittent failures - bug 941575.
 [browser_fxaccounts.js]

new file mode 100644
--- /dev/null
+++ b/browser/base/content/test/webextensions/browser.ini
@@ -0,0 +1,20 @@
+[DEFAULT]
+support-files =
+  file_install_extensions.html
+  browser_legacy.xpi
+  browser_legacy_webext.xpi
+  browser_webext_permissions.xpi
+  browser_webext_nopermissions.xpi
+  browser_webext_update1.xpi
+  browser_webext_update2.xpi
+  browser_webext_update_icon1.xpi
+  browser_webext_update_icon2.xpi
+  browser_webext_update_perms1.xpi
+  browser_webext_update_perms2.xpi
+  browser_webext_update.json
+  browser_webext_search.xml
+
+[browser_extension_permissions.js]
+[browser_extension_sideloading.js]
+[browser_extension_update_background.js]
+[browser_extension_update_interactive.js]

rename from browser/base/content/test/general/browser_extension_permissions.js
rename to browser/base/content/test/webextensions/browser_extension_permissions.js

rename from browser/base/content/test/general/browser_extension_sideloading.js
rename to browser/base/content/test/webextensions/browser_extension_sideloading.js

rename from browser/base/content/test/general/browser_extension_update_background.js
rename to browser/base/content/test/webextensions/browser_extension_update_background.js

rename from browser/base/content/test/general/browser_extension_update_interactive.js
rename to browser/base/content/test/webextensions/browser_extension_update_interactive.js
--- a/browser/base/content/test/general/browser_extension_update_interactive.js
+++ b/browser/base/content/test/webextensions/browser_extension_update_interactive.js
@@ -1,11 +1,11 @@
 const {AddonManagerPrivate} = Cu.import("resource://gre/modules/AddonManager.jsm", {});
 
-const URL_BASE = "https://example.com/browser/browser/base/content/test/general";
+const URL_BASE = "https://example.com/browser/browser/base/content/test/webextensions";
 const ID = "update2@tests.mozilla.org";
 const ID_LEGACY = "legacy_update@tests.mozilla.org";
 
 registerCleanupFunction(async function() {
   for (let id of [ID, ID_LEGACY]) {
     let addon = await AddonManager.getAddonByID(id);
     if (addon) {
       ok(false, `Addon ${id} was still installed at the end of the test`);

rename from browser/base/content/test/general/browser_legacy.xpi
rename to browser/base/content/test/webextensions/browser_legacy.xpi

rename from browser/base/content/test/general/browser_legacy_webext.xpi
rename to browser/base/content/test/webextensions/browser_legacy_webext.xpi

rename from browser/base/content/test/general/browser_webext_nopermissions.xpi
rename to browser/base/content/test/webextensions/browser_webext_nopermissions.xpi

rename from browser/base/content/test/general/browser_webext_permissions.xpi
rename to browser/base/content/test/webextensions/browser_webext_permissions.xpi

rename from browser/base/content/test/general/browser_webext_search.xml
rename to browser/base/content/test/webextensions/browser_webext_search.xml
--- a/browser/base/content/test/general/browser_webext_search.xml
+++ b/browser/base/content/test/webextensions/browser_webext_search.xml
@@ -16,17 +16,17 @@
       <application>
         <name>Firefox</name>
         <appID>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</appID>
         <min_version>0</min_version>
         <max_version>*</max_version>
       </application>
     </compatible_applications>
     <compatible_os>ALL</compatible_os>
-    <install size="1">https://example.com/browser/browser/base/content/test/general/browser_webext_permissions.xpi</install>
+    <install size="1">https://example.com/browser/browser/base/content/test/webextensions/browser_webext_permissions.xpi</install>
   </addon>
 
   <addon>
     <name>no permissions</name>
     <type id='1'>Extension</type>
     <guid>nopermissions@tests.mozilla.org</guid>
     <version>1.0</version>
     <authors>
@@ -40,12 +40,12 @@
       <application>
         <name>Firefox</name>
         <appID>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</appID>
         <min_version>0</min_version>
         <max_version>*</max_version>
       </application>
     </compatible_applications>
     <compatible_os>ALL</compatible_os>
-    <install size="1">https://example.com/browser/browser/base/content/test/general/browser_webext_nopermissions.xpi</install>
+    <install size="1">https://example.com/browser/browser/base/content/test/webextensions/browser_webext_nopermissions.xpi</install>
   </addon>
 </searchresults>
 

rename from browser/base/content/test/general/browser_webext_update.json
rename to browser/base/content/test/webextensions/browser_webext_update.json
--- a/browser/base/content/test/general/browser_webext_update.json
+++ b/browser/base/content/test/webextensions/browser_webext_update.json
@@ -1,57 +1,57 @@
 {
   "addons": {
     "update2@tests.mozilla.org": {
       "updates": [
         {
           "version": "2.0",
-          "update_link": "https://example.com/browser/browser/base/content/test/general/browser_webext_update2.xpi",
+          "update_link": "https://example.com/browser/browser/base/content/test/webextensions/browser_webext_update2.xpi",
           "applications": {
             "gecko": {
               "strict_min_version": "1",
               "advisory_max_version": "55.0"
             }
           }
         }
       ]
     },
     "update_icon2@tests.mozilla.org": {
       "updates": [
         {
           "version": "2.0",
-          "update_link": "https://example.com/browser/browser/base/content/test/general/browser_webext_update_icon2.xpi",
+          "update_link": "https://example.com/browser/browser/base/content/test/webextensions/browser_webext_update_icon2.xpi",
           "applications": {
             "gecko": {
               "strict_min_version": "1",
               "advisory_max_version": "55.0"
             }
           }
         }
       ]
     },
     "update_perms@tests.mozilla.org": {
       "updates": [
         {
           "version": "2.0",
-          "update_link": "https://example.com/browser/browser/base/content/test/general/browser_webext_update_perms2.xpi",
+          "update_link": "https://example.com/browser/browser/base/content/test/webextensions/browser_webext_update_perms2.xpi",
           "applications": {
             "gecko": {
               "strict_min_version": "1",
               "advisory_max_version": "55.0"
             }
           }
         }
       ]
     },
     "legacy_update@tests.mozilla.org": {
       "updates": [
         {
           "version": "2.0",
-          "update_link": "https://example.com/browser/browser/base/content/test/general/browser_legacy_webext.xpi",
+          "update_link": "https://example.com/browser/browser/base/content/test/webextensions/browser_legacy_webext.xpi",
           "applications": {
             "gecko": {
               "strict_min_version": "1",
               "advisory_max_version": "*"
             }
           }
         }
       ]

rename from browser/base/content/test/general/browser_webext_update1.xpi
rename to browser/base/content/test/webextensions/browser_webext_update1.xpi

rename from browser/base/content/test/general/browser_webext_update2.xpi
rename to browser/base/content/test/webextensions/browser_webext_update2.xpi

rename from browser/base/content/test/general/browser_webext_update_icon1.xpi
rename to browser/base/content/test/webextensions/browser_webext_update_icon1.xpi

rename from browser/base/content/test/general/browser_webext_update_icon2.xpi
rename to browser/base/content/test/webextensions/browser_webext_update_icon2.xpi

rename from browser/base/content/test/general/browser_webext_update_perms1.xpi
rename to browser/base/content/test/webextensions/browser_webext_update_perms1.xpi

rename from browser/base/content/test/general/browser_webext_update_perms2.xpi
rename to browser/base/content/test/webextensions/browser_webext_update_perms2.xpi

rename from browser/base/content/test/general/file_install_extensions.html
rename to browser/base/content/test/webextensions/file_install_extensions.html

--- a/browser/base/moz.build
+++ b/browser/base/moz.build
@@ -23,16 +23,17 @@ BROWSER_CHROME_MANIFESTS += [
     'content/test/popupNotifications/browser.ini',
     'content/test/referrer/browser.ini',
     'content/test/siteIdentity/browser.ini',
     'content/test/social/browser.ini',
     'content/test/tabcrashed/browser.ini',
     'content/test/tabPrompts/browser.ini',
     'content/test/tabs/browser.ini',
     'content/test/urlbar/browser.ini',
+    'content/test/webextensions/browser.ini',
     'content/test/webrtc/browser.ini',
 ]
 
 DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 DEFINES['MOZ_APP_VERSION_DISPLAY'] = CONFIG['MOZ_APP_VERSION_DISPLAY']
 
 DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR