diff --git a/browser/base/content/test/chrome/moz.build b/browser/base/content/test/chrome/moz.build
deleted file mode 100644
index 87c88dfddbc..00000000000
--- a/browser/base/content/test/chrome/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_CHROME_MANIFESTS += ['chrome.ini']
-
diff --git a/browser/base/content/test/general/moz.build b/browser/base/content/test/general/moz.build
index 363dfa971e6..c271ec3908c 100644
--- a/browser/base/content/test/general/moz.build
+++ b/browser/base/content/test/general/moz.build
@@ -3,8 +3,3 @@
 # 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']
-
-BROWSER_CHROME_MANIFESTS += ['browser.ini']
-
diff --git a/browser/base/content/test/moz.build b/browser/base/content/test/moz.build
deleted file mode 100644
index 2c05b0fac28..00000000000
--- a/browser/base/content/test/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/.
-
-DIRS += ['chrome', 'general', 'newtab', 'social']
-
diff --git a/browser/base/content/test/newtab/moz.build b/browser/base/content/test/newtab/moz.build
deleted file mode 100644
index 33f04f85378..00000000000
--- a/browser/base/content/test/newtab/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/browser/base/content/test/social/browser.ini b/browser/base/content/test/social/browser.ini
index ee72221d8ef..40669aded7b 100644
--- a/browser/base/content/test/social/browser.ini
+++ b/browser/base/content/test/social/browser.ini
@@ -3,6 +3,11 @@ support-files =
   blocklist.xml
   checked.jpg
   head.js
+  opengraph/og_invalid_url.html
+  opengraph/opengraph.html
+  opengraph/shortlink_linkrel.html
+  opengraph/shorturl_link.html
+  opengraph/shorturl_linkrel.html
   share.html
   social_activate.html
   social_activate_iframe.html
diff --git a/browser/base/content/test/social/moz.build b/browser/base/content/test/social/moz.build
deleted file mode 100644
index 716ca34d560..00000000000
--- a/browser/base/content/test/social/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 += ['opengraph']
-
-BROWSER_CHROME_MANIFESTS += ['browser.ini']
-
diff --git a/browser/base/content/test/social/opengraph/Makefile.in b/browser/base/content/test/social/opengraph/Makefile.in
deleted file mode 100644
index c963a72831d..00000000000
--- a/browser/base/content/test/social/opengraph/Makefile.in
+++ /dev/null
@@ -1,11 +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 := \
-                 opengraph.html \
-                 og_invalid_url.html \
-                 shortlink_linkrel.html \
-                 shorturl_link.html \
-                 shorturl_linkrel.html \
-                 $(NULL)
diff --git a/browser/base/content/test/social/opengraph/moz.build b/browser/base/content/test/social/opengraph/moz.build
deleted file mode 100644
index 89251dc3962..00000000000
--- a/browser/base/content/test/social/opengraph/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# 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/browser/base/moz.build b/browser/base/moz.build
index d1354137020..b945757d4d3 100644
--- a/browser/base/moz.build
+++ b/browser/base/moz.build
@@ -4,4 +4,20 @@
 # 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 += ['content/test']
+TEST_DIRS += [
+    'content/test/general',
+]
+
+MOCHITEST_MANIFESTS += [
+    'content/test/general/mochitest.ini',
+]
+
+MOCHITEST_CHROME_MANIFESTS += [
+    'content/test/chrome/chrome.ini',
+]
+
+BROWSER_CHROME_MANIFESTS += [
+    'content/test/general/browser.ini',
+    'content/test/newtab/browser.ini',
+    'content/test/social/browser.ini',
+]