diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini
index 8bdb1be38b9a..47d6371eaa93 100644
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -74,19 +74,6 @@ support-files =
   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
@@ -256,10 +243,6 @@ skip-if = os == "mac" # decoder doctor isn't implemented on osx
 [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]
diff --git a/browser/base/content/test/webextensions/browser.ini b/browser/base/content/test/webextensions/browser.ini
new file mode 100644
index 000000000000..818f393de50f
--- /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]
diff --git a/browser/base/content/test/general/browser_extension_permissions.js b/browser/base/content/test/webextensions/browser_extension_permissions.js
similarity index 100%
rename from browser/base/content/test/general/browser_extension_permissions.js
rename to browser/base/content/test/webextensions/browser_extension_permissions.js
diff --git a/browser/base/content/test/general/browser_extension_sideloading.js b/browser/base/content/test/webextensions/browser_extension_sideloading.js
similarity index 100%
rename from browser/base/content/test/general/browser_extension_sideloading.js
rename to browser/base/content/test/webextensions/browser_extension_sideloading.js
diff --git a/browser/base/content/test/general/browser_extension_update_background.js b/browser/base/content/test/webextensions/browser_extension_update_background.js
similarity index 100%
rename from browser/base/content/test/general/browser_extension_update_background.js
rename to browser/base/content/test/webextensions/browser_extension_update_background.js
diff --git a/browser/base/content/test/general/browser_extension_update_interactive.js b/browser/base/content/test/webextensions/browser_extension_update_interactive.js
similarity index 99%
rename from browser/base/content/test/general/browser_extension_update_interactive.js
rename to browser/base/content/test/webextensions/browser_extension_update_interactive.js
index e6c29df89586..51a33e46a9d6 100644
--- a/browser/base/content/test/general/browser_extension_update_interactive.js
+++ b/browser/base/content/test/webextensions/browser_extension_update_interactive.js
@@ -1,6 +1,6 @@
 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";
 
diff --git a/browser/base/content/test/general/browser_legacy.xpi b/browser/base/content/test/webextensions/browser_legacy.xpi
similarity index 100%
rename from browser/base/content/test/general/browser_legacy.xpi
rename to browser/base/content/test/webextensions/browser_legacy.xpi
diff --git a/browser/base/content/test/general/browser_legacy_webext.xpi b/browser/base/content/test/webextensions/browser_legacy_webext.xpi
similarity index 100%
rename from browser/base/content/test/general/browser_legacy_webext.xpi
rename to browser/base/content/test/webextensions/browser_legacy_webext.xpi
diff --git a/browser/base/content/test/general/browser_webext_nopermissions.xpi b/browser/base/content/test/webextensions/browser_webext_nopermissions.xpi
similarity index 100%
rename from browser/base/content/test/general/browser_webext_nopermissions.xpi
rename to browser/base/content/test/webextensions/browser_webext_nopermissions.xpi
diff --git a/browser/base/content/test/general/browser_webext_permissions.xpi b/browser/base/content/test/webextensions/browser_webext_permissions.xpi
similarity index 100%
rename from browser/base/content/test/general/browser_webext_permissions.xpi
rename to browser/base/content/test/webextensions/browser_webext_permissions.xpi
diff --git a/browser/base/content/test/general/browser_webext_search.xml b/browser/base/content/test/webextensions/browser_webext_search.xml
similarity index 91%
rename from browser/base/content/test/general/browser_webext_search.xml
rename to browser/base/content/test/webextensions/browser_webext_search.xml
index 196dda929256..23b8ce8d37ba 100644
--- a/browser/base/content/test/general/browser_webext_search.xml
+++ b/browser/base/content/test/webextensions/browser_webext_search.xml
@@ -21,7 +21,7 @@
       </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>
@@ -45,7 +45,7 @@
       </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>
 
diff --git a/browser/base/content/test/general/browser_webext_update.json b/browser/base/content/test/webextensions/browser_webext_update.json
similarity index 85%
rename from browser/base/content/test/general/browser_webext_update.json
rename to browser/base/content/test/webextensions/browser_webext_update.json
index 3aa2bb5a8b5b..fd53bde526af 100644
--- a/browser/base/content/test/general/browser_webext_update.json
+++ b/browser/base/content/test/webextensions/browser_webext_update.json
@@ -4,7 +4,7 @@
       "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",
@@ -18,7 +18,7 @@
       "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",
@@ -32,7 +32,7 @@
       "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",
@@ -46,7 +46,7 @@
       "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",
diff --git a/browser/base/content/test/general/browser_webext_update1.xpi b/browser/base/content/test/webextensions/browser_webext_update1.xpi
similarity index 100%
rename from browser/base/content/test/general/browser_webext_update1.xpi
rename to browser/base/content/test/webextensions/browser_webext_update1.xpi
diff --git a/browser/base/content/test/general/browser_webext_update2.xpi b/browser/base/content/test/webextensions/browser_webext_update2.xpi
similarity index 100%
rename from browser/base/content/test/general/browser_webext_update2.xpi
rename to browser/base/content/test/webextensions/browser_webext_update2.xpi
diff --git a/browser/base/content/test/general/browser_webext_update_icon1.xpi b/browser/base/content/test/webextensions/browser_webext_update_icon1.xpi
similarity index 100%
rename from browser/base/content/test/general/browser_webext_update_icon1.xpi
rename to browser/base/content/test/webextensions/browser_webext_update_icon1.xpi
diff --git a/browser/base/content/test/general/browser_webext_update_icon2.xpi b/browser/base/content/test/webextensions/browser_webext_update_icon2.xpi
similarity index 100%
rename from browser/base/content/test/general/browser_webext_update_icon2.xpi
rename to browser/base/content/test/webextensions/browser_webext_update_icon2.xpi
diff --git a/browser/base/content/test/general/browser_webext_update_perms1.xpi b/browser/base/content/test/webextensions/browser_webext_update_perms1.xpi
similarity index 100%
rename from browser/base/content/test/general/browser_webext_update_perms1.xpi
rename to browser/base/content/test/webextensions/browser_webext_update_perms1.xpi
diff --git a/browser/base/content/test/general/browser_webext_update_perms2.xpi b/browser/base/content/test/webextensions/browser_webext_update_perms2.xpi
similarity index 100%
rename from browser/base/content/test/general/browser_webext_update_perms2.xpi
rename to browser/base/content/test/webextensions/browser_webext_update_perms2.xpi
diff --git a/browser/base/content/test/general/file_install_extensions.html b/browser/base/content/test/webextensions/file_install_extensions.html
similarity index 100%
rename from browser/base/content/test/general/file_install_extensions.html
rename to browser/base/content/test/webextensions/file_install_extensions.html
diff --git a/browser/base/moz.build b/browser/base/moz.build
index 11a9625edfa1..589f22024790 100644
--- a/browser/base/moz.build
+++ b/browser/base/moz.build
@@ -28,6 +28,7 @@ BROWSER_CHROME_MANIFESTS += [
     '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',
 ]