diff --git a/content/html/content/test/bug649134/Makefile.in b/content/html/content/test/bug649134/Makefile.in
deleted file mode 100644
index f159a1ec411..00000000000
--- a/content/html/content/test/bug649134/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-MOCHITEST_FILES = file_bug649134-1.sjs file_bug649134-2.sjs index.html
diff --git a/content/html/content/test/bug649134/moz.build b/content/html/content/test/bug649134/moz.build
deleted file mode 100644
index 895d11993cf..00000000000
--- a/content/html/content/test/bug649134/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
diff --git a/content/html/content/test/forms/moz.build b/content/html/content/test/forms/moz.build
deleted file mode 100644
index 3cf16eb0cfe..00000000000
--- a/content/html/content/test/forms/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
diff --git a/content/html/content/test/mochitest.ini b/content/html/content/test/mochitest.ini
index 7eb25b96ffe..dd0c928e208 100644
--- a/content/html/content/test/mochitest.ini
+++ b/content/html/content/test/mochitest.ini
@@ -325,6 +325,16 @@ support-files =
 [test_bug643051.html]
 [test_bug646157.html]
 [test_bug649134.html]
+# This extra subdirectory is needed due to the nature of this test.
+# With the bug, the test loads the base URL of the bug649134/file_*.sjs
+# files, and the mochitest server responds with the contents of index.html if
+# it exists in that case, which we use to detect failure.
+# We cannot have index.html in this directory because it would prevent
+# running the tests here.
+support-files =
+  bug649134/file_bug649134-1.sjs
+  bug649134/file_bug649134-2.sjs
+  bug649134/index.html
 [test_bug651956.html]
 [test_bug658746.html]
 [test_bug659596.html]
diff --git a/content/html/content/test/moz.build b/content/html/content/test/moz.build
index e48c800febb..449671087b1 100644
--- a/content/html/content/test/moz.build
+++ b/content/html/content/test/moz.build
@@ -4,17 +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/.
 
-# This extra subdirectory is needed due to the nature of this test.
-# With the bug, the test loads the base URL of the bug649134/file_*.sjs
-# files, and the mochitest server responds with the contents of index.html if
-# it exists in that case, which we use to detect failure.
-# We can't have index.html in this directory because it would prevent
-# running the tests here.
-TEST_DIRS += ['bug649134']
-
-TEST_DIRS += ['forms']
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
+MOCHITEST_MANIFESTS += ['forms/mochitest.ini', 'mochitest.ini']
 
 MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
 
diff --git a/docshell/test/Makefile.in b/docshell/test/Makefile.in
deleted file mode 100644
index 9124df33862..00000000000
--- a/docshell/test/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-# Disabled for too many intermittent failures (bug 719186)
-#		test_bug413310.html \
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-MOCHITEST_FILES += \
-		test_bug511449.html \
-		file_bug511449.html \
-		$(NULL)
-endif
diff --git a/docshell/test/browser/moz.build b/docshell/test/browser/moz.build
deleted file mode 100644
index 33f04f85378..00000000000
--- a/docshell/test/browser/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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.ini']
-
diff --git a/docshell/test/mochitest.ini b/docshell/test/mochitest.ini
index 06ac16ba6d7..936237f0dad 100644
--- a/docshell/test/mochitest.ini
+++ b/docshell/test/mochitest.ini
@@ -44,8 +44,14 @@ support-files =
 [test_bug387979.html]
 [test_bug402210.html]
 [test_bug404548.html]
+[test_bug413310.html]
+# Disabled for too many intermittent failures (bug 719186)
+skip-if = true
 [test_bug475636.html]
 [test_bug509055.html]
+[test_bug511449.html]
+skip-if = toolkit != "cocoa"
+support-files = file_bug511449.html
 [test_bug529119-1.html]
 [test_bug529119-2.html]
 [test_bug540462.html]
diff --git a/docshell/test/moz.build b/docshell/test/moz.build
index f595c822fea..4e3a6716c3a 100644
--- a/docshell/test/moz.build
+++ b/docshell/test/moz.build
@@ -4,7 +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/.
 
-DIRS += ['chrome', 'navigation', 'browser']
+DIRS += ['chrome', 'navigation']
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
@@ -16,3 +16,5 @@ MOCHITEST_MANIFESTS += [
     'iframesandbox/mochitest.ini',
     'mochitest.ini'
 ]
+BROWSER_CHROME_MANIFESTS += ['browser/browser.ini']
+
diff --git a/dom/browser-element/mochitest/moz.build b/dom/browser-element/mochitest/moz.build
index 5391ef08970..cd446c3aa67 100644
--- a/dom/browser-element/mochitest/moz.build
+++ b/dom/browser-element/mochitest/moz.build
@@ -4,4 +4,4 @@
 # 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/.
 
-DIRS = ['priority']
+MOCHITEST_MANIFESTS += ['priority/mochitest.ini']
diff --git a/dom/browser-element/mochitest/priority/Makefile.in b/dom/browser-element/mochitest/priority/Makefile.in
deleted file mode 100644
index 71b22357a75..00000000000
--- a/dom/browser-element/mochitest/priority/Makefile.in
+++ /dev/null
@@ -1,39 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-# Note: ../browserElementTestHelpers.js makes all tests in this directory OOP,
-# because testing the process-priority manager without OOP frames doesn't make
-# much sense.
-#
-# Good luck running these tests on anything but desktop Linux.
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-
-# This test disabled due to bug 865844.  In fact, it was never enabled!
-#
-#       test_WebGLContextLost.html \
-#       file_WebGLContextLost.html \
-
-MOCHITEST_FILES = \
-	test_Simple.html \
-	test_Visibility.html \
-	test_HighPriority.html \
-	file_HighPriority.html \
-	test_HighPriorityDowngrade.html \
-	test_HighPriorityDowngrade2.html \
-	test_Background.html \
-	test_BackgroundLRU.html \
-	test_Audio.html \
-	file_Audio.html \
-	silence.ogg \
-	test_MultipleFrames.html \
-	file_MultipleFrames.html \
-	test_Preallocated.html \
-	test_ExpectingSystemMessage.html \
-	test_ExpectingSystemMessage2.html \
-	test_NestedFrames.html \
-	file_NestedFramesOuter.html \
-	$(NULL)
-
-endif # MOZ_WIDGET_TOOLKIT == gtk2
diff --git a/dom/browser-element/mochitest/priority/mochitest.ini b/dom/browser-element/mochitest/priority/mochitest.ini
new file mode 100644
index 00000000000..0cc5c095a55
--- /dev/null
+++ b/dom/browser-element/mochitest/priority/mochitest.ini
@@ -0,0 +1,30 @@
+[DEFAULT]
+# Good luck running these tests on anything but desktop Linux.
+skip-if = toolkit != "gtk2"
+
+# Note: ../browserElementTestHelpers.js makes all tests in this directory OOP,
+# because testing the process-priority manager without OOP frames does not make
+# much sense.
+
+[test_Simple.html]
+[test_Visibility.html]
+[test_HighPriority.html]
+support-files = file_HighPriority.html
+[test_HighPriorityDowngrade.html]
+[test_HighPriorityDowngrade2.html]
+[test_Background.html]
+[test_BackgroundLRU.html]
+[test_Audio.html]
+support-files = file_Audio.html silence.ogg
+[test_MultipleFrames.html]
+support-files = file_MultipleFrames.html
+[test_Preallocated.html]
+[test_ExpectingSystemMessage.html]
+[test_ExpectingSystemMessage2.html]
+[test_NestedFrames.html]
+support-files = file_NestedFramesOuter.html
+[test_WebGLContextLost.html]
+# This test disabled due to bug 865844.  In fact, it was never enabled!
+skip-if = true
+support-files = file_WebGLContextLost.html
+
diff --git a/dom/browser-element/mochitest/priority/moz.build b/dom/browser-element/mochitest/priority/moz.build
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/dom/media/tests/mochitest/Makefile.in b/dom/media/tests/mochitest/Makefile.in
deleted file mode 100644
index f0beca99b9a..00000000000
--- a/dom/media/tests/mochitest/Makefile.in
+++ /dev/null
@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-# The following tests are leaking and cannot be run by default yet
-ifdef MOZ_WEBRTC_LEAKING_TESTS
-MOCHITEST_FILES += \
-  $(NULL)
-endif
diff --git a/extensions/spellcheck/moz.build b/extensions/spellcheck/moz.build
index a4c0e0a1821..5d28969f70f 100644
--- a/extensions/spellcheck/moz.build
+++ b/extensions/spellcheck/moz.build
@@ -5,5 +5,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += ['idl', 'locales', 'hunspell', 'src']
-TEST_DIRS += ['tests/chrome']
 
+MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini']
diff --git a/extensions/spellcheck/tests/chrome/base/Makefile.in b/extensions/spellcheck/tests/chrome/base/Makefile.in
deleted file mode 100644
index f5c9c8c2776..00000000000
--- a/extensions/spellcheck/tests/chrome/base/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-MOCHITEST_CHROME_FILES = 	base_utf.dic \
-				base_utf.aff \
-				$(NULL)
diff --git a/extensions/spellcheck/tests/chrome/base/moz.build b/extensions/spellcheck/tests/chrome/base/moz.build
deleted file mode 100644
index 895d11993cf..00000000000
--- a/extensions/spellcheck/tests/chrome/base/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
diff --git a/extensions/spellcheck/tests/chrome/chrome.ini b/extensions/spellcheck/tests/chrome/chrome.ini
index 3798fcb7a38..ee78f752584 100644
--- a/extensions/spellcheck/tests/chrome/chrome.ini
+++ b/extensions/spellcheck/tests/chrome/chrome.ini
@@ -1,3 +1,8 @@
 [DEFAULT]
 
 [test_add_remove_dictionaries.xul]
+support-files =
+  base/base_utf.dic
+  base/base_utf.aff
+  map/maputf.dic
+  map/maputf.aff
diff --git a/extensions/spellcheck/tests/chrome/map/Makefile.in b/extensions/spellcheck/tests/chrome/map/Makefile.in
deleted file mode 100644
index 45e6d1b5169..00000000000
--- a/extensions/spellcheck/tests/chrome/map/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-MOCHITEST_CHROME_FILES = 	maputf.dic \
-				maputf.aff \
-				$(NULL)
diff --git a/extensions/spellcheck/tests/chrome/map/moz.build b/extensions/spellcheck/tests/chrome/map/moz.build
deleted file mode 100644
index 895d11993cf..00000000000
--- a/extensions/spellcheck/tests/chrome/map/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
diff --git a/extensions/spellcheck/tests/chrome/moz.build b/extensions/spellcheck/tests/chrome/moz.build
deleted file mode 100644
index bc9d4b11691..00000000000
--- a/extensions/spellcheck/tests/chrome/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-DIRS += ['base', 'map']
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-
diff --git a/toolkit/components/passwordmgr/test/Makefile.in b/toolkit/components/passwordmgr/test/Makefile.in
deleted file mode 100644
index 9e940d32d1d..00000000000
--- a/toolkit/components/passwordmgr/test/Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-include $(topsrcdir)/config/config.mk
-
-# Mochitest tests
-ifneq ($(OS_TARGET),Linux)
-MOCHITEST_FILES += \
-    test_prompt.html \
-    $(NULL)
-endif
-
-# This test doesn't pass because we can't ensure a cross-platform
-# event that occurs between DOMContentLoaded and Pageload
-# test_bug_221634.html
diff --git a/toolkit/components/passwordmgr/test/auth2/Makefile.in b/toolkit/components/passwordmgr/test/auth2/Makefile.in
deleted file mode 100644
index bd9fd24a529..00000000000
--- a/toolkit/components/passwordmgr/test/auth2/Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-MOCHITEST_FILES = \
-    authenticate.sjs \
-		$(NULL)
diff --git a/toolkit/components/passwordmgr/test/auth2/moz.build b/toolkit/components/passwordmgr/test/auth2/moz.build
deleted file mode 100644
index 895d11993cf..00000000000
--- a/toolkit/components/passwordmgr/test/auth2/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
diff --git a/toolkit/components/passwordmgr/test/browser/moz.build b/toolkit/components/passwordmgr/test/browser/moz.build
deleted file mode 100644
index 33f04f85378..00000000000
--- a/toolkit/components/passwordmgr/test/browser/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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.ini']
-
diff --git a/toolkit/components/passwordmgr/test/mochitest.ini b/toolkit/components/passwordmgr/test/mochitest.ini
index 72c8d078cad..92443fdcfcd 100644
--- a/toolkit/components/passwordmgr/test/mochitest.ini
+++ b/toolkit/components/passwordmgr/test/mochitest.ini
@@ -24,6 +24,7 @@ support-files =
   subtst_privbrowsing_3.html
   subtst_privbrowsing_4.html
   subtst_prompt_async.html
+  auth2/authenticate.sjs
 
 [test_basic_form.html]
 [test_basic_form_0pw.html]
@@ -40,6 +41,10 @@ support-files =
 [test_basic_form_observer_foundLogins.html]
 [test_basic_form_pwevent.html]
 [test_basic_form_pwonly.html]
+[test_bug_221634.html]
+# This test doesn't pass because we can't ensure a cross-platform event that
+# occurs between DOMContentLoaded and Pageload
+skip-if = true
 [test_bug_227640.html]
 [test_bug_242956.html]
 [test_bug_360493_1.html]
@@ -57,6 +62,8 @@ skip-if = true
 [test_notifications.html]
 [test_notifications_popup.html]
 skip-if = os == "linux" # bug 934057
+[test_prompt.html]
+skip-if = os == "linux"
 [test_prompt_async.html]
 [test_xhr.html]
 [test_xml_load.html]
diff --git a/toolkit/components/passwordmgr/test/moz.build b/toolkit/components/passwordmgr/test/moz.build
index 8629ff6704c..7c4e190b5d6 100644
--- a/toolkit/components/passwordmgr/test/moz.build
+++ b/toolkit/components/passwordmgr/test/moz.build
@@ -4,11 +4,10 @@
 # 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/.
 
-TEST_DIRS += ['browser', 'auth2']
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 MOCHITEST_MANIFESTS += ['mochitest.ini']
 
 MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
 
+BROWSER_CHROME_MANIFESTS += ['browser/browser.ini']
diff --git a/toolkit/components/perf/Makefile.in b/toolkit/components/perf/Makefile.in
deleted file mode 100644
index 814c705607b..00000000000
--- a/toolkit/components/perf/Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-LOCAL_INCLUDES := \
-  -I$(topsrcdir)/js/xpconnect/loader \
-  $(NULL)
-
-ifdef ENABLE_TESTS
-MOCHITEST_CHROME_FILES = \
-    test_pm.xul \
-    $(NULL)
-endif
diff --git a/toolkit/components/perf/chrome.ini b/toolkit/components/perf/chrome.ini
new file mode 100644
index 00000000000..eaa3c2401d9
--- /dev/null
+++ b/toolkit/components/perf/chrome.ini
@@ -0,0 +1,3 @@
+[DEFAULT]
+
+[test_pm.xul]
diff --git a/toolkit/components/perf/moz.build b/toolkit/components/perf/moz.build
index 130148a029c..6d229aa11e6 100644
--- a/toolkit/components/perf/moz.build
+++ b/toolkit/components/perf/moz.build
@@ -15,3 +15,9 @@ EXTRA_JS_MODULES += [
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
+
+LOCAL_INCLUDES += [
+    '/js/xpconnect/loader',
+]
+
+MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
diff --git a/toolkit/content/tests/browser/browser.ini b/toolkit/content/tests/browser/browser.ini
index f2669a4efc0..cfd87d9dd28 100644
--- a/toolkit/content/tests/browser/browser.ini
+++ b/toolkit/content/tests/browser/browser.ini
@@ -8,3 +8,7 @@
 [browser_input_file_tooltips.js]
 [browser_keyevents_during_autoscrolling.js]
 [browser_save_resend_postdata.js]
+support-files =
+  common/mockTransfer.js
+  data/post_form_inner.sjs
+  data/post_form_outer.sjs
diff --git a/toolkit/content/tests/browser/common/Makefile.in b/toolkit/content/tests/browser/common/Makefile.in
deleted file mode 100644
index eead015eb16..00000000000
--- a/toolkit/content/tests/browser/common/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-MOCHITEST_BROWSER_FILES = \
-  mockTransfer.js \
-  $(NULL)
diff --git a/toolkit/content/tests/browser/common/moz.build b/toolkit/content/tests/browser/common/moz.build
deleted file mode 100644
index 895d11993cf..00000000000
--- a/toolkit/content/tests/browser/common/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
diff --git a/toolkit/content/tests/browser/data/Makefile.in b/toolkit/content/tests/browser/data/Makefile.in
deleted file mode 100644
index 347b2a9c8f4..00000000000
--- a/toolkit/content/tests/browser/data/Makefile.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-MOCHITEST_BROWSER_FILES = \
-  post_form_inner.sjs \
-  post_form_outer.sjs \
-  $(NULL)
diff --git a/toolkit/content/tests/browser/data/moz.build b/toolkit/content/tests/browser/data/moz.build
deleted file mode 100644
index 895d11993cf..00000000000
--- a/toolkit/content/tests/browser/data/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
diff --git a/toolkit/content/tests/browser/moz.build b/toolkit/content/tests/browser/moz.build
deleted file mode 100644
index 1049f93d946..00000000000
--- a/toolkit/content/tests/browser/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-DIRS += ['common', 'data']
-
-BROWSER_CHROME_MANIFESTS += ['browser.ini']
-
diff --git a/toolkit/content/tests/chrome/chrome.ini b/toolkit/content/tests/chrome/chrome.ini
index fa71682440c..89980a8e52d 100644
--- a/toolkit/content/tests/chrome/chrome.ini
+++ b/toolkit/content/tests/chrome/chrome.ini
@@ -40,6 +40,11 @@ support-files =
   window_subframe_origin.xul
   window_titlebar.xul
   xul_selectcontrol.js
+  rtlchrome/rtl.css
+  rtlchrome/rtl.dtd
+  rtlchrome/rtl.manifest
+  rtltest/righttoleft.manifest
+  rtltest/content/dirtest.xul
 
 [test_about_networking.html]
 [test_arrowpanel.xul]
diff --git a/toolkit/content/tests/chrome/moz.build b/toolkit/content/tests/chrome/moz.build
index 96431b7aeb2..87c88dfddbc 100644
--- a/toolkit/content/tests/chrome/moz.build
+++ b/toolkit/content/tests/chrome/moz.build
@@ -4,7 +4,5 @@
 # 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/.
 
-DIRS += ['rtltest', 'rtlchrome']
-
 MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
 
diff --git a/toolkit/content/tests/chrome/rtlchrome/Makefile.in b/toolkit/content/tests/chrome/rtlchrome/Makefile.in
deleted file mode 100644
index 4f782262162..00000000000
--- a/toolkit/content/tests/chrome/rtlchrome/Makefile.in
+++ /dev/null
@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-MOCHITEST_CHROME_FILES := \
-  rtl.css \
-  rtl.dtd \
-  rtl.manifest \
-  $(NULL)
diff --git a/toolkit/content/tests/chrome/rtlchrome/moz.build b/toolkit/content/tests/chrome/rtlchrome/moz.build
deleted file mode 100644
index 895d11993cf..00000000000
--- a/toolkit/content/tests/chrome/rtlchrome/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
diff --git a/toolkit/content/tests/chrome/rtltest/Makefile.in b/toolkit/content/tests/chrome/rtltest/Makefile.in
deleted file mode 100644
index 1144f581b05..00000000000
--- a/toolkit/content/tests/chrome/rtltest/Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-MOCHITEST_CHROME_FILES := \
-  righttoleft.manifest \
-  $(NULL)
diff --git a/toolkit/content/tests/chrome/rtltest/content/Makefile.in b/toolkit/content/tests/chrome/rtltest/content/Makefile.in
deleted file mode 100644
index cf3fff2f6a0..00000000000
--- a/toolkit/content/tests/chrome/rtltest/content/Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-MOCHITEST_CHROME_FILES := \
-  dirtest.xul \
-  $(NULL)
diff --git a/toolkit/content/tests/chrome/rtltest/content/moz.build b/toolkit/content/tests/chrome/rtltest/content/moz.build
deleted file mode 100644
index 895d11993cf..00000000000
--- a/toolkit/content/tests/chrome/rtltest/content/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
diff --git a/toolkit/content/tests/chrome/rtltest/moz.build b/toolkit/content/tests/chrome/rtltest/moz.build
deleted file mode 100644
index 2540d3effe4..00000000000
--- a/toolkit/content/tests/chrome/rtltest/moz.build
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-DIRS += [
-    'content',
-]
diff --git a/toolkit/content/tests/moz.build b/toolkit/content/tests/moz.build
index 05cf8e41ff8..40a4e1d9383 100644
--- a/toolkit/content/tests/moz.build
+++ b/toolkit/content/tests/moz.build
@@ -4,6 +4,8 @@
 # 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/.
 
-DIRS += ['chrome', 'widgets', 'browser']
+DIRS += ['chrome', 'widgets']
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
+BROWSER_CHROME_MANIFESTS += ['browser/browser.ini']