diff --git a/toolkit/mozapps/extensions/test/browser/Makefile.in b/toolkit/mozapps/extensions/test/browser/Makefile.in
index b97542159077..6bd692d9b299 100644
--- a/toolkit/mozapps/extensions/test/browser/Makefile.in
+++ b/toolkit/mozapps/extensions/test/browser/Makefile.in
@@ -5,111 +5,6 @@
 ADDONSRC = $(srcdir)/addons
 TESTXPI = $(CURDIR)/$(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)/addons
 
-MOCHITEST_BROWSER_MAIN_FILES = \
-  head.js \
-  browser_about.js \
-  browser_bug523784.js \
-  browser_bug557943.js \
-  browser_bug562797.js \
-  browser_bug562854.js \
-  browser_bug562890.js \
-  browser_bug562899.js \
-  browser_bug562992.js \
-  browser_bug567127.js \
-  browser_bug567137.js \
-  browser_bug570760.js \
-  browser_bug572561.js \
-  browser_bug577990.js \
-  browser_bug580298.js \
-  browser_bug581076.js \
-  browser_bug586574.js \
-  browser_bug587970.js \
-  browser_bug591465.js \
-  browser_bug591663.js \
-  browser_bug593535.js \
-  browser_bug596336.js \
-  browser_bug608316.js \
-  browser_bug610764.js \
-  browser_bug618502.js \
-  browser_bug679604.js \
-  browser_bug714593.js \
-  browser_bug590347.js \
-  browser_details.js \
-  browser_discovery.js \
-  browser_dragdrop.js \
-  browser_list.js \
-  browser_metadataTimeout.js \
-  browser_searching.js \
-  browser_sorting.js \
-  browser_uninstalling.js \
-  browser_install.js \
-  browser_recentupdates.js \
-  browser_manualupdates.js \
-  browser_globalwarnings.js \
-  browser_globalinformations.js \
-  browser_eula.js \
-  browser_updateid.js \
-  browser_purchase.js \
-  browser_openDialog.js \
-  browser_types.js \
-  browser_inlinesettings.js \
-  browser_inlinesettings_custom.js \
-  browser_inlinesettings_info.js \
-  browser_tabsettings.js \
-  browser_pluginprefs.js \
-  browser_CTP_plugins.js \
-  $(NULL)
-
-MOCHITEST_BROWSER_FILES = \
-  $(MOCHITEST_BROWSER_MAIN_FILES) \
-  browser_addonrepository_performance.js \
-  browser_bug557956.js \
-  browser_bug616841.js \
-  browser_checkAddonCompatibility.js \
-  browser_hotfix.js \
-  browser_installssl.js \
-  browser_newaddon.js \
-  browser_select_compatoverrides.js \
-  browser_select_confirm.js \
-  browser_select_selection.js \
-  browser_select_update.js \
-  browser_updatessl.js \
-  addon_about.xul \
-  addon_prefs.xul \
-  browser_bug557956.rdf \
-  browser_bug557956_8_2.xpi \
-  browser_bug557956_9_2.xpi \
-  browser_bug557956.xml \
-  browser_bug591465.xml \
-  browser_bug593535.xml \
-  browser_searching.xml \
-  browser_searching_empty.xml \
-  browser_select_compatoverrides.xml \
-  browser_updatessl.rdf \
-  browser_updatessl.rdf^headers^ \
-  browser_install.rdf \
-  browser_install.rdf^headers^ \
-  browser_install.xml \
-  browser_install1_3.xpi \
-  browser_eula.xml \
-  browser_purchase.xml \
-  discovery.html \
-  signed_hotfix.rdf \
-  signed_hotfix.xpi \
-  unsigned_hotfix.rdf \
-  unsigned_hotfix.xpi \
-  more_options.xul \
-  options.xul \
-  plugin_test.html \
-  redirect.sjs \
-  releaseNotes.xhtml \
-  blockNoPlugins.xml \
-  blockPluginHard.xml \
-  $(NULL)
-
-MOCHITEST_BROWSER_MAIN_DEST = $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)-window
-INSTALL_TARGETS += MOCHITEST_BROWSER_MAIN
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
diff --git a/toolkit/mozapps/extensions/test/browser/browser-common.ini b/toolkit/mozapps/extensions/test/browser/browser-common.ini
new file mode 100644
index 000000000000..e58ccbeb996d
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/browser/browser-common.ini
@@ -0,0 +1,55 @@
+[DEFAULT]
+support-files =
+  head.js
+
+[browser_about.js]
+[browser_bug523784.js]
+[browser_bug557943.js]
+[browser_bug562797.js]
+[browser_bug562854.js]
+[browser_bug562890.js]
+[browser_bug562899.js]
+[browser_bug562992.js]
+[browser_bug567127.js]
+[browser_bug567137.js]
+[browser_bug570760.js]
+[browser_bug572561.js]
+[browser_bug577990.js]
+[browser_bug580298.js]
+[browser_bug581076.js]
+[browser_bug586574.js]
+[browser_bug587970.js]
+[browser_bug591465.js]
+[browser_bug591663.js]
+[browser_bug593535.js]
+[browser_bug596336.js]
+[browser_bug608316.js]
+[browser_bug610764.js]
+[browser_bug618502.js]
+[browser_bug679604.js]
+[browser_bug714593.js]
+[browser_bug590347.js]
+[browser_details.js]
+[browser_discovery.js]
+[browser_dragdrop.js]
+[browser_list.js]
+[browser_metadataTimeout.js]
+[browser_searching.js]
+[browser_sorting.js]
+[browser_uninstalling.js]
+[browser_install.js]
+[browser_recentupdates.js]
+[browser_manualupdates.js]
+[browser_globalwarnings.js]
+[browser_globalinformations.js]
+[browser_eula.js]
+[browser_updateid.js]
+[browser_purchase.js]
+[browser_openDialog.js]
+[browser_types.js]
+[browser_inlinesettings.js]
+[browser_inlinesettings_custom.js]
+[browser_inlinesettings_info.js]
+[browser_tabsettings.js]
+[browser_pluginprefs.js]
+[browser_CTP_plugins.js]
diff --git a/toolkit/mozapps/extensions/test/browser/browser-window.ini b/toolkit/mozapps/extensions/test/browser/browser-window.ini
new file mode 100644
index 000000000000..95494eb3e823
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/browser/browser-window.ini
@@ -0,0 +1,4 @@
+[DEFAULT]
+install-to-subdir = test-window
+
+[include:browser-common.ini]
diff --git a/toolkit/mozapps/extensions/test/browser/browser.ini b/toolkit/mozapps/extensions/test/browser/browser.ini
new file mode 100644
index 000000000000..2e1606a4fdbe
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/browser/browser.ini
@@ -0,0 +1,48 @@
+[DEFAULT]
+support-files =
+  addon_about.xul
+  addon_prefs.xul
+  discovery.html
+  signed_hotfix.rdf
+  signed_hotfix.xpi
+  unsigned_hotfix.rdf
+  unsigned_hotfix.xpi
+  more_options.xul
+  options.xul
+  plugin_test.html
+  redirect.sjs
+  releaseNotes.xhtml
+  blockNoPlugins.xml
+  blockPluginHard.xml
+  browser_bug557956.rdf
+  browser_bug557956_8_2.xpi
+  browser_bug557956_9_2.xpi
+  browser_bug557956.xml
+  browser_bug591465.xml
+  browser_bug593535.xml
+  browser_searching.xml
+  browser_searching_empty.xml
+  browser_select_compatoverrides.xml
+  browser_updatessl.rdf
+  browser_updatessl.rdf^headers^
+  browser_install.rdf
+  browser_install.rdf^headers^
+  browser_install.xml
+  browser_install1_3.xpi
+  browser_eula.xml
+  browser_purchase.xml
+
+[browser_addonrepository_performance.js]
+[browser_bug557956.js]
+[browser_bug616841.js]
+[browser_checkAddonCompatibility.js]
+[browser_hotfix.js]
+[browser_installssl.js]
+[browser_newaddon.js]
+[browser_select_compatoverrides.js]
+[browser_select_confirm.js]
+[browser_select_selection.js]
+[browser_select_update.js]
+[browser_updatessl.js]
+
+[include:browser-common.ini]
diff --git a/toolkit/mozapps/extensions/test/browser/head.js b/toolkit/mozapps/extensions/test/browser/head.js
index de3643082279..3f889d9c0b12 100644
--- a/toolkit/mozapps/extensions/test/browser/head.js
+++ b/toolkit/mozapps/extensions/test/browser/head.js
@@ -16,8 +16,9 @@ pathParts.splice(pathParts.length - 1, pathParts.length);
 var gTestInWindow = /-window$/.test(pathParts[pathParts.length - 1]);
 
 // Drop the UI type
-pathParts.splice(pathParts.length - 1, pathParts.length);
-pathParts.push("browser");
+if (gTestInWindow) {
+  pathParts.splice(pathParts.length - 1, pathParts.length);
+}
 
 const RELATIVE_DIR = pathParts.slice(4).join("/") + "/";
 
diff --git a/toolkit/mozapps/extensions/test/browser/moz.build b/toolkit/mozapps/extensions/test/browser/moz.build
index 895d11993cfb..9acb42133ca7 100644
--- a/toolkit/mozapps/extensions/test/browser/moz.build
+++ b/toolkit/mozapps/extensions/test/browser/moz.build
@@ -4,3 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+BROWSER_CHROME_MANIFESTS += [
+    'browser-window.ini',
+    'browser.ini',
+]