diff --git a/addon-sdk/test/Makefile.in b/addon-sdk/test/Makefile.in
index da16af2dba5..449148d3e29 100644
--- a/addon-sdk/test/Makefile.in
+++ b/addon-sdk/test/Makefile.in
@@ -8,7 +8,7 @@ srcdir           = @srcdir@
 VPATH            = @srcdir@
 relativesrcdir   = @relativesrcdir@
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/addon-sdk/test/moz.build b/addon-sdk/test/moz.build
index 9baec5b57d8..ee5373f265c 100644
--- a/addon-sdk/test/moz.build
+++ b/addon-sdk/test/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_addon_sdk'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/b2g/components/test/Makefile.in b/b2g/components/test/Makefile.in
index 5f8ea9ca0a8..c8764c6dcee 100644
--- a/b2g/components/test/Makefile.in
+++ b/b2g/components/test/Makefile.in
@@ -13,6 +13,6 @@ FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/b2g/components/test/moz.build b/b2g/components/test/moz.build
index 80b801b6554..556309ce409 100644
--- a/b2g/components/test/moz.build
+++ b/b2g/components/test/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'B2GComponents'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/browser/components/dirprovider/tests/Makefile.in b/browser/components/dirprovider/tests/Makefile.in
index bbaf4194fd2..f6d65b5bea4 100644
--- a/browser/components/dirprovider/tests/Makefile.in
+++ b/browser/components/dirprovider/tests/Makefile.in
@@ -10,6 +10,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/dirprovider/tests/moz.build b/browser/components/dirprovider/tests/moz.build
index 0e9803569ff..3e825b7cd1d 100644
--- a/browser/components/dirprovider/tests/moz.build
+++ b/browser/components/dirprovider/tests/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_browserdir'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/browser/components/downloads/test/Makefile.in b/browser/components/downloads/test/Makefile.in
index 7002adf1e0f..f64f04aa64f 100644
--- a/browser/components/downloads/test/Makefile.in
+++ b/browser/components/downloads/test/Makefile.in
@@ -10,6 +10,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/downloads/test/moz.build b/browser/components/downloads/test/moz.build
index af1434b9306..30780a141d5 100644
--- a/browser/components/downloads/test/moz.build
+++ b/browser/components/downloads/test/moz.build
@@ -5,3 +5,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += ['browser']
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/browser/components/feeds/test/Makefile.in b/browser/components/feeds/test/Makefile.in
index db9ac6c29c3..444464c6d03 100644
--- a/browser/components/feeds/test/Makefile.in
+++ b/browser/components/feeds/test/Makefile.in
@@ -10,7 +10,7 @@ relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS	= unit
+DISABLED_XPCSHELL_TESTS	= unit
 
 MOCHITEST_FILES =	bug408328-data.xml \
 		bug368464-data.xml \
diff --git a/browser/components/feeds/test/moz.build b/browser/components/feeds/test/moz.build
index 75fd694a05d..51e55b106fb 100644
--- a/browser/components/feeds/test/moz.build
+++ b/browser/components/feeds/test/moz.build
@@ -8,3 +8,4 @@ DIRS += ['chrome']
 
 MODULE = 'test_browser_feeds'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/browser/components/migration/tests/Makefile.in b/browser/components/migration/tests/Makefile.in
index 3071e196914..5bcf64dcc78 100644
--- a/browser/components/migration/tests/Makefile.in
+++ b/browser/components/migration/tests/Makefile.in
@@ -10,6 +10,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/migration/tests/moz.build b/browser/components/migration/tests/moz.build
index 895d11993cf..191c90f0b92 100644
--- a/browser/components/migration/tests/moz.build
+++ b/browser/components/migration/tests/moz.build
@@ -4,3 +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/.
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/browser/components/places/tests/Makefile.in b/browser/components/places/tests/Makefile.in
index 87555f0b264..8a09c0ec1c1 100644
--- a/browser/components/places/tests/Makefile.in
+++ b/browser/components/places/tests/Makefile.in
@@ -11,6 +11,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/places/tests/moz.build b/browser/components/places/tests/moz.build
index 90becb916c7..a91509a3ff7 100644
--- a/browser/components/places/tests/moz.build
+++ b/browser/components/places/tests/moz.build
@@ -8,3 +8,4 @@ DIRS += ['browser', 'chrome']
 
 MODULE = 'test_browser_places'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/browser/components/sessionstore/test/Makefile.in b/browser/components/sessionstore/test/Makefile.in
index 5189930841a..4a808f5431d 100644
--- a/browser/components/sessionstore/test/Makefile.in
+++ b/browser/components/sessionstore/test/Makefile.in
@@ -15,7 +15,7 @@ include $(DEPTH)/config/autoconf.mk
 # browser_589246.js is disabled for leaking browser windows (bug 752467)
 # browser_580512.js is disabled for leaking browser windows (bug 752467)
 
-XPCSHELL_TESTS = \
+DISABLED_XPCSHELL_TESTS = \
 	unit \
 	$(NULL)
 
diff --git a/browser/components/sessionstore/test/moz.build b/browser/components/sessionstore/test/moz.build
index 895d11993cf..191c90f0b92 100644
--- a/browser/components/sessionstore/test/moz.build
+++ b/browser/components/sessionstore/test/moz.build
@@ -4,3 +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/.
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/browser/components/shell/test/Makefile.in b/browser/components/shell/test/Makefile.in
index 9c8b88abcb8..b387e911917 100644
--- a/browser/components/shell/test/Makefile.in
+++ b/browser/components/shell/test/Makefile.in
@@ -10,7 +10,7 @@ relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS	= unit
+DISABLED_XPCSHELL_TESTS	= unit
 
 
 MOCHITEST_BROWSER_FILES = browser_420786.js \
diff --git a/browser/components/shell/test/moz.build b/browser/components/shell/test/moz.build
index 6240379278d..e68a73ba4cf 100644
--- a/browser/components/shell/test/moz.build
+++ b/browser/components/shell/test/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_browser_shell'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/browser/devtools/shared/test/Makefile.in b/browser/devtools/shared/test/Makefile.in
index d453941933c..8911a24db8b 100644
--- a/browser/devtools/shared/test/Makefile.in
+++ b/browser/devtools/shared/test/Makefile.in
@@ -11,7 +11,7 @@ relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 MOCHITEST_BROWSER_FILES = \
   browser_browser_basic.js \
diff --git a/browser/devtools/shared/test/moz.build b/browser/devtools/shared/test/moz.build
index 895d11993cf..191c90f0b92 100644
--- a/browser/devtools/shared/test/moz.build
+++ b/browser/devtools/shared/test/moz.build
@@ -4,3 +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/.
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/browser/metro/base/tests/Makefile.in b/browser/metro/base/tests/Makefile.in
index d5c0d3b39a7..bd4b02aea71 100644
--- a/browser/metro/base/tests/Makefile.in
+++ b/browser/metro/base/tests/Makefile.in
@@ -10,7 +10,7 @@ relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 # For now we're copying the actual Util code.
 # We should make this into a jsm module. See bug 848137
diff --git a/browser/metro/base/tests/moz.build b/browser/metro/base/tests/moz.build
index f7e08177524..86576fc42d3 100644
--- a/browser/metro/base/tests/moz.build
+++ b/browser/metro/base/tests/moz.build
@@ -5,3 +5,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['mochitest']
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/chrome/test/Makefile.in b/chrome/test/Makefile.in
index a83015495ee..8e52ff54d38 100644
--- a/chrome/test/Makefile.in
+++ b/chrome/test/Makefile.in
@@ -10,11 +10,11 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit \
+DISABLED_XPCSHELL_TESTS = unit \
                  $(NULL)
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
 ifneq ($(OS_ARCH),Darwin)
-XPCSHELL_TESTS += unit_ipc
+DISABLED_XPCSHELL_TESTS += unit_ipc
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/chrome/test/moz.build b/chrome/test/moz.build
index 8c666aedaf1..275255174b4 100644
--- a/chrome/test/moz.build
+++ b/chrome/test/moz.build
@@ -6,3 +6,8 @@
 
 MODULE = 'test_chrome'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
+# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
+if CONFIG['OS_ARCH'] != 'Darwin':
+    XPCSHELL_TESTS_MANIFESTS += ['unit_ipc/xpcshell.ini']
diff --git a/content/base/test/Makefile.in b/content/base/test/Makefile.in
index 7bdbcbd959b..fc0edf70ad3 100644
--- a/content/base/test/Makefile.in
+++ b/content/base/test/Makefile.in
@@ -18,12 +18,12 @@ CPP_UNIT_TESTS = \
                  $(NULL)
 
 
-XPCSHELL_TESTS = \
+DISABLED_XPCSHELL_TESTS = \
                unit \
                $(NULL)
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
 ifneq ($(OS_ARCH),Darwin)
-XPCSHELL_TESTS += unit_ipc
+DISABLED_XPCSHELL_TESTS += unit_ipc
 endif
 
 
diff --git a/content/base/test/moz.build b/content/base/test/moz.build
index 8f8f9274e90..22c8c8dd347 100644
--- a/content/base/test/moz.build
+++ b/content/base/test/moz.build
@@ -8,3 +8,8 @@ DIRS += ['chrome', 'websocket_hybi']
 
 MODULE = 'content'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
+# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
+if CONFIG['OS_ARCH'] != 'Darwin':
+    XPCSHELL_TESTS_MANIFESTS += ['unit_ipc/xpcshell.ini']
diff --git a/content/test/Makefile.in b/content/test/Makefile.in
index 1a2a87eaecd..8cd03dff9e2 100644
--- a/content/test/Makefile.in
+++ b/content/test/Makefile.in
@@ -11,6 +11,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS  = unit
+DISABLED_XPCSHELL_TESTS  = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/content/test/moz.build b/content/test/moz.build
index 80593e54575..5f3fdbf0250 100644
--- a/content/test/moz.build
+++ b/content/test/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_content'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/docshell/test/Makefile.in b/docshell/test/Makefile.in
index 3166b7f2c2c..d39b099948b 100644
--- a/docshell/test/Makefile.in
+++ b/docshell/test/Makefile.in
@@ -11,10 +11,10 @@ relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
 ifneq ($(OS_ARCH),Darwin)
-XPCSHELL_TESTS += unit_ipc
+DISABLED_XPCSHELL_TESTS += unit_ipc
 endif
 
 MOCHITEST_FILES = \
diff --git a/docshell/test/moz.build b/docshell/test/moz.build
index aa28f174b0d..ecada339dbc 100644
--- a/docshell/test/moz.build
+++ b/docshell/test/moz.build
@@ -8,3 +8,8 @@ DIRS += ['chrome', 'navigation', 'browser']
 
 MODULE = 'test_docshell'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
+# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
+if CONFIG['OS_ARCH'] != 'Darwin':
+    XPCSHELL_TESTS_MANIFESTS += ['unit_ipc/xpcshell.ini']
diff --git a/dom/activities/tests/Makefile.in b/dom/activities/tests/Makefile.in
index f095455bd1c..4f00654c265 100644
--- a/dom/activities/tests/Makefile.in
+++ b/dom/activities/tests/Makefile.in
@@ -12,6 +12,6 @@ FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/activities/tests/moz.build b/dom/activities/tests/moz.build
index 895d11993cf..191c90f0b92 100644
--- a/dom/activities/tests/moz.build
+++ b/dom/activities/tests/moz.build
@@ -4,3 +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/.
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/dom/apps/tests/Makefile.in b/dom/apps/tests/Makefile.in
index b00f28d85df..c47206c9c2a 100644
--- a/dom/apps/tests/Makefile.in
+++ b/dom/apps/tests/Makefile.in
@@ -24,6 +24,6 @@ MOCHITEST_CHROME_FILES = \
   test_apps_service.xul \
   $(NULL)
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/apps/tests/moz.build b/dom/apps/tests/moz.build
index 895d11993cf..191c90f0b92 100644
--- a/dom/apps/tests/moz.build
+++ b/dom/apps/tests/moz.build
@@ -4,3 +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/.
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/dom/encoding/test/Makefile.in b/dom/encoding/test/Makefile.in
index 6abdf7b85e1..33756de4a83 100644
--- a/dom/encoding/test/Makefile.in
+++ b/dom/encoding/test/Makefile.in
@@ -10,7 +10,7 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 MOCHITEST_FILES = \
   file_utf16_be_bom.css \
diff --git a/dom/encoding/test/moz.build b/dom/encoding/test/moz.build
index d692075b47f..dc5584b5b40 100644
--- a/dom/encoding/test/moz.build
+++ b/dom/encoding/test/moz.build
@@ -5,3 +5,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['unit']
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/dom/indexedDB/ipc/Makefile.in b/dom/indexedDB/ipc/Makefile.in
index f1a14334b55..01ae95e048c 100644
--- a/dom/indexedDB/ipc/Makefile.in
+++ b/dom/indexedDB/ipc/Makefile.in
@@ -30,7 +30,7 @@ DEFINES += -D_IMPL_NS_LAYOUT
 MOCHITEST_FILES = test_ipc.html
 
 # Need to enable these tests sometime soon.
-#XPCSHELL_TESTS = unit
+#DISABLED_XPCSHELL_TESTS = unit
 
 # We're copying tests from another directory so this check is wrong for us.
 #NO_XPCSHELL_MANIFEST_CHECK = 1
@@ -39,9 +39,11 @@ include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
+xpcshell_tests = unit
+
 # Copy all the normal xpcshell tests from the regular unit directory.
 copy-xpcshell-tests:
 	$(call install_cmd,$(wildcard $(topsrcdir)/dom/indexedDB/test/unit/test_*.js) \
-		$(testxpcobjdir)/$(relativesrcdir)/$(XPCSHELL_TESTS))
+		$(testxpcobjdir)/$(relativesrcdir)/$(xpcshell_tests))
 
 libs-xpcshell-tests: copy-xpcshell-tests
diff --git a/dom/indexedDB/ipc/moz.build b/dom/indexedDB/ipc/moz.build
index 6e1eb9c54ca..1804b1be1c7 100644
--- a/dom/indexedDB/ipc/moz.build
+++ b/dom/indexedDB/ipc/moz.build
@@ -10,3 +10,5 @@ EXPORTS.mozilla.dom.indexedDB += [
     'SerializationHelpers.h',
 ]
 
+# Need to enable these tests sometime soon.
+#XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/dom/indexedDB/test/Makefile.in b/dom/indexedDB/test/Makefile.in
index 418bdf0191c..8444de3ae1a 100644
--- a/dom/indexedDB/test/Makefile.in
+++ b/dom/indexedDB/test/Makefile.in
@@ -10,7 +10,7 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 MOCHITEST_FILES = \
   bfcache_iframe1.html \
diff --git a/dom/indexedDB/test/moz.build b/dom/indexedDB/test/moz.build
index d692075b47f..dc5584b5b40 100644
--- a/dom/indexedDB/test/moz.build
+++ b/dom/indexedDB/test/moz.build
@@ -5,3 +5,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['unit']
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/dom/mms/Makefile.in b/dom/mms/Makefile.in
index aaa5ab5d53d..e1b47156e8e 100644
--- a/dom/mms/Makefile.in
+++ b/dom/mms/Makefile.in
@@ -13,7 +13,7 @@ include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_B2G_RIL
 ifdef ENABLE_TESTS
-XPCSHELL_TESTS = tests
+DISABLED_XPCSHELL_TESTS = tests
 endif
 endif
 
diff --git a/dom/mms/moz.build b/dom/mms/moz.build
index 0f03209577a..5448b75bce3 100644
--- a/dom/mms/moz.build
+++ b/dom/mms/moz.build
@@ -5,3 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 PARALLEL_DIRS += ['interfaces', 'src']
+
+if CONFIG['MOZ_B2G_RIL'] and CONFIG['ENABLE_TESTS']:
+    XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
diff --git a/dom/mobilemessage/Makefile.in b/dom/mobilemessage/Makefile.in
index cfa730adc58..447e5dd55d7 100644
--- a/dom/mobilemessage/Makefile.in
+++ b/dom/mobilemessage/Makefile.in
@@ -12,7 +12,7 @@ relativesrcdir   = @relativesrcdir@
 include $(DEPTH)/config/autoconf.mk
 
 ifdef ENABLE_TESTS
-XPCSHELL_TESTS = tests
+DISABLED_XPCSHELL_TESTS = tests
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/mobilemessage/moz.build b/dom/mobilemessage/moz.build
index 390d7f3bda9..01b112bdeee 100644
--- a/dom/mobilemessage/moz.build
+++ b/dom/mobilemessage/moz.build
@@ -6,3 +6,6 @@
 
 DIRS += ['interfaces', 'src']
 TEST_DIRS += ['tests']
+
+if CONFIG['ENABLE_TESTS']:
+    XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
diff --git a/dom/network/tests/Makefile.in b/dom/network/tests/Makefile.in
index 36f6d1f3186..8d12855fdbf 100644
--- a/dom/network/tests/Makefile.in
+++ b/dom/network/tests/Makefile.in
@@ -27,10 +27,10 @@ MOCHITEST_FILES = \
   $(NULL)
 endif
 
-XPCSHELL_TESTS = unit unit_ipc
+DISABLED_XPCSHELL_TESTS = unit unit_ipc
 
 ifdef MOZ_B2G_RIL
-XPCSHELL_TESTS += unit_stats
+DISABLED_XPCSHELL_TESTS += unit_stats
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/network/tests/moz.build b/dom/network/tests/moz.build
index da9d8b96db6..191a5d6babb 100644
--- a/dom/network/tests/moz.build
+++ b/dom/network/tests/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'test_dom_socket'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini', 'unit_ipc/xpcshell.ini']
+
+if CONFIG['MOZ_B2G_RIL']:
+    XPCSHELL_TESTS_MANIFESTS += ['unit_stats/xpcshell.ini']
diff --git a/dom/payment/tests/Makefile.in b/dom/payment/tests/Makefile.in
index 8038480f70f..01e45202084 100644
--- a/dom/payment/tests/Makefile.in
+++ b/dom/payment/tests/Makefile.in
@@ -11,6 +11,6 @@ relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/payment/tests/moz.build b/dom/payment/tests/moz.build
index 07567d139b9..c74b89b19ed 100644
--- a/dom/payment/tests/moz.build
+++ b/dom/payment/tests/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_dom_payment'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/dom/permission/tests/Makefile.in b/dom/permission/tests/Makefile.in
index af97961cd4d..388c9a5933a 100644
--- a/dom/permission/tests/Makefile.in
+++ b/dom/permission/tests/Makefile.in
@@ -11,7 +11,7 @@ relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS  = unit
+DISABLED_XPCSHELL_TESTS  = unit
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/dom/permission/tests/moz.build b/dom/permission/tests/moz.build
index 51dde8933f3..a467fe66b1e 100644
--- a/dom/permission/tests/moz.build
+++ b/dom/permission/tests/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_permission'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/dom/plugins/test/Makefile.in b/dom/plugins/test/Makefile.in
index 73e20b77f15..5aa5a1a70b9 100644
--- a/dom/plugins/test/Makefile.in
+++ b/dom/plugins/test/Makefile.in
@@ -11,7 +11,7 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = \
+DISABLED_XPCSHELL_TESTS = \
   unit \
   $(NULL)
 
diff --git a/dom/plugins/test/moz.build b/dom/plugins/test/moz.build
index 0b1bb4d65b5..07f408cb528 100644
--- a/dom/plugins/test/moz.build
+++ b/dom/plugins/test/moz.build
@@ -11,3 +11,4 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'cocoa', 'windows'):
 
 MODULE = 'test_plugin'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/dom/src/json/test/Makefile.in b/dom/src/json/test/Makefile.in
index 9198df9484e..aa446328732 100644
--- a/dom/src/json/test/Makefile.in
+++ b/dom/src/json/test/Makefile.in
@@ -11,7 +11,7 @@ relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
  MOCHITEST_FILES =	test_json.html \
 		$(NULL)
diff --git a/dom/src/json/test/moz.build b/dom/src/json/test/moz.build
index cb01ad32760..fe142f8afd5 100644
--- a/dom/src/json/test/moz.build
+++ b/dom/src/json/test/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'json_test'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/dom/system/gonk/Makefile.in b/dom/system/gonk/Makefile.in
index b6e56362519..d3108b0ba75 100644
--- a/dom/system/gonk/Makefile.in
+++ b/dom/system/gonk/Makefile.in
@@ -77,7 +77,7 @@ EXTRA_JS_MODULES = \
   $(NULL)
 
 ifdef ENABLE_TESTS
-XPCSHELL_TESTS = tests
+DISABLED_XPCSHELL_TESTS = tests
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/system/gonk/moz.build b/dom/system/gonk/moz.build
index 3a2e45a58f7..7fee24e8954 100644
--- a/dom/system/gonk/moz.build
+++ b/dom/system/gonk/moz.build
@@ -40,3 +40,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
         'GonkGPSGeolocationProvider.h',
         'nsVolume.h',
     ]
+
+if CONFIG['ENABLE_TESTS']:
+    XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
diff --git a/dom/tests/Makefile.in b/dom/tests/Makefile.in
index 497558f11e4..697c18ff704 100644
--- a/dom/tests/Makefile.in
+++ b/dom/tests/Makefile.in
@@ -10,6 +10,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/tests/moz.build b/dom/tests/moz.build
index 0ed1e29fd05..a58aa49ee1d 100644
--- a/dom/tests/moz.build
+++ b/dom/tests/moz.build
@@ -8,3 +8,4 @@ DIRS += ['mochitest', 'browser']
 
 MODULE = 'test_dom'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/embedding/Makefile.in b/embedding/Makefile.in
index 9717637082c..e65da66cd62 100644
--- a/embedding/Makefile.in
+++ b/embedding/Makefile.in
@@ -12,7 +12,7 @@ relativesrcdir = @relativesrcdir@
 include $(DEPTH)/config/autoconf.mk
 
 ifdef ENABLE_TESTS
-XPCSHELL_TESTS = tests/unit
+DISABLED_XPCSHELL_TESTS = tests/unit
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/embedding/moz.build b/embedding/moz.build
index 10f1b26fa74..c18c33dcb9f 100644
--- a/embedding/moz.build
+++ b/embedding/moz.build
@@ -9,3 +9,5 @@ TEST_DIRS += ['test']
 
 MODULE = 'embed'
 
+if CONFIG['ENABLE_TESTS']:
+    XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
diff --git a/extensions/cookie/test/Makefile.in b/extensions/cookie/test/Makefile.in
index bbcfd24ba10..4538a0f160d 100644
--- a/extensions/cookie/test/Makefile.in
+++ b/extensions/cookie/test/Makefile.in
@@ -61,11 +61,11 @@ MOCHITEST_BROWSER_FILES = \
   browser_test_favicon.js \
   $(NULL)
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
 ifneq ($(OS_ARCH),Darwin)
-XPCSHELL_TESTS += unit_ipc
+DISABLED_XPCSHELL_TESTS += unit_ipc
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/extensions/cookie/test/moz.build b/extensions/cookie/test/moz.build
index d65c8b335ac..93d0576a955 100644
--- a/extensions/cookie/test/moz.build
+++ b/extensions/cookie/test/moz.build
@@ -6,3 +6,8 @@
 
 MODULE = 'test_cookies'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
+# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
+if CONFIG['OS_ARCH'] != 'Darwin':
+    XPCSHELL_TESTS_MANIFESTS += ['unit_ipc/xpcshell.ini']
diff --git a/extensions/spellcheck/hunspell/Makefile.in b/extensions/spellcheck/hunspell/Makefile.in
index 982d165fd03..48303e24c79 100644
--- a/extensions/spellcheck/hunspell/Makefile.in
+++ b/extensions/spellcheck/hunspell/Makefile.in
@@ -11,7 +11,7 @@ relativesrcdir = @relativesrcdir@
 include $(DEPTH)/config/autoconf.mk
 
 ifdef ENABLE_TESTS
-XPCSHELL_TESTS = tests/unit
+DISABLED_XPCSHELL_TESTS = tests/unit
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/extensions/spellcheck/hunspell/moz.build b/extensions/spellcheck/hunspell/moz.build
index e270db72cbc..4e07949d242 100644
--- a/extensions/spellcheck/hunspell/moz.build
+++ b/extensions/spellcheck/hunspell/moz.build
@@ -8,3 +8,5 @@ DIRS += ['src']
 
 MODULE = 'hunspell'
 
+if CONFIG['ENABLE_TESTS']:
+    XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
diff --git a/gfx/tests/Makefile.in b/gfx/tests/Makefile.in
index 3d77be1ffdf..de9a29a9bcc 100644
--- a/gfx/tests/Makefile.in
+++ b/gfx/tests/Makefile.in
@@ -13,7 +13,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MOZILLA_INTERNAL_API = 1
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 MOCHITEST_FILES = $(addprefix mochitest/, \
 	test_bug509244.html \
diff --git a/gfx/tests/moz.build b/gfx/tests/moz.build
index 759fd0641b6..e1184f79082 100644
--- a/gfx/tests/moz.build
+++ b/gfx/tests/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'gfx'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/image/test/Makefile.in b/image/test/Makefile.in
index 1c45240e8ef..749eaef9167 100644
--- a/image/test/Makefile.in
+++ b/image/test/Makefile.in
@@ -11,6 +11,6 @@ relativesrcdir  = @relativesrcdir@
 include $(DEPTH)/config/autoconf.mk
 
 # Module name for xpcshell tests.
-XPCSHELL_TESTS  = unit
+DISABLED_XPCSHELL_TESTS  = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/image/test/moz.build b/image/test/moz.build
index 30ead633fe6..ecc3c51376e 100644
--- a/image/test/moz.build
+++ b/image/test/moz.build
@@ -8,3 +8,4 @@ TEST_DIRS += ['mochitest', 'browser']
 
 MODULE = 'test_libpr0n'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/intl/locale/tests/Makefile.in b/intl/locale/tests/Makefile.in
index 1a2a87eaecd..8cd03dff9e2 100644
--- a/intl/locale/tests/Makefile.in
+++ b/intl/locale/tests/Makefile.in
@@ -11,6 +11,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS  = unit
+DISABLED_XPCSHELL_TESTS  = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/intl/locale/tests/moz.build b/intl/locale/tests/moz.build
index 63bccb78a5c..c690a7fddb4 100644
--- a/intl/locale/tests/moz.build
+++ b/intl/locale/tests/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_intl_locale'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/intl/strres/tests/Makefile.in b/intl/strres/tests/Makefile.in
index fec162520c8..aab1580b771 100644
--- a/intl/strres/tests/Makefile.in
+++ b/intl/strres/tests/Makefile.in
@@ -11,6 +11,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS	 = unit
+DISABLED_XPCSHELL_TESTS	 = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/intl/strres/tests/moz.build b/intl/strres/tests/moz.build
index a7f6393d344..89f90ec9d74 100644
--- a/intl/strres/tests/moz.build
+++ b/intl/strres/tests/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_intl_strres'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/intl/uconv/tests/Makefile.in b/intl/uconv/tests/Makefile.in
index 89b589ebc80..560cc15ef1a 100644
--- a/intl/uconv/tests/Makefile.in
+++ b/intl/uconv/tests/Makefile.in
@@ -11,7 +11,7 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS	= unit
+DISABLED_XPCSHELL_TESTS	= unit
 
 # Tests disabled because they dont work in libxul builds.
 #MOZILLA_INTERNAL_API = 1
diff --git a/intl/uconv/tests/moz.build b/intl/uconv/tests/moz.build
index 3e3274d93c5..6476e91ca05 100644
--- a/intl/uconv/tests/moz.build
+++ b/intl/uconv/tests/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_intl_uconv'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/intl/unicharutil/tests/Makefile.in b/intl/unicharutil/tests/Makefile.in
index 29bd0471f2e..d238a0258fb 100644
--- a/intl/unicharutil/tests/Makefile.in
+++ b/intl/unicharutil/tests/Makefile.in
@@ -11,7 +11,7 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS	= unit
+DISABLED_XPCSHELL_TESTS	= unit
 
 USE_STATIC_LIBS = 1
 
diff --git a/intl/unicharutil/tests/moz.build b/intl/unicharutil/tests/moz.build
index 8056f30384d..2400a0a9793 100644
--- a/intl/unicharutil/tests/moz.build
+++ b/intl/unicharutil/tests/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_intl_unicharutil'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/ipc/testshell/Makefile.in b/ipc/testshell/Makefile.in
index b81d2ec371b..d9e9c242d51 100644
--- a/ipc/testshell/Makefile.in
+++ b/ipc/testshell/Makefile.in
@@ -30,7 +30,7 @@ LOCAL_INCLUDES += \
 
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
 ifneq ($(OS_ARCH),Darwin)
-XPCSHELL_TESTS = tests
+DISABLED_XPCSHELL_TESTS = tests
 endif
 
 include $(topsrcdir)/config/config.mk
diff --git a/ipc/testshell/moz.build b/ipc/testshell/moz.build
index a3bff58d570..71e41734628 100644
--- a/ipc/testshell/moz.build
+++ b/ipc/testshell/moz.build
@@ -12,3 +12,6 @@ EXPORTS.mozilla.ipc += [
     'XPCShellEnvironment.h',
 ]
 
+# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
+if CONFIG['OS_ARCH'] != 'Darwin':
+    XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
diff --git a/js/ductwork/debugger/Makefile.in b/js/ductwork/debugger/Makefile.in
index bc16d745afe..4f934740d23 100644
--- a/js/ductwork/debugger/Makefile.in
+++ b/js/ductwork/debugger/Makefile.in
@@ -30,6 +30,6 @@ EXTRA_JS_MODULES = \
   jsdebugger.jsm \
   $(NULL)
 
-XPCSHELL_TESTS = tests
+DISABLED_XPCSHELL_TESTS = tests
 
 include $(topsrcdir)/config/rules.mk
diff --git a/js/ductwork/debugger/moz.build b/js/ductwork/debugger/moz.build
index ca7b9df4722..873982e6785 100644
--- a/js/ductwork/debugger/moz.build
+++ b/js/ductwork/debugger/moz.build
@@ -10,3 +10,4 @@ XPIDL_SOURCES += [
 
 MODULE = 'jsdebugger'
 
+XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
diff --git a/js/ipc/tests/Makefile.in b/js/ipc/tests/Makefile.in
index f662cceabd1..6d13b698805 100644
--- a/js/ipc/tests/Makefile.in
+++ b/js/ipc/tests/Makefile.in
@@ -11,7 +11,7 @@ include $(DEPTH)/config/autoconf.mk
 
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
 ifneq ($(OS_ARCH),Darwin)
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 endif
 
 include $(topsrcdir)/config/config.mk
diff --git a/js/ipc/tests/moz.build b/js/ipc/tests/moz.build
index d1ca5bdc2e3..6b52f737443 100644
--- a/js/ipc/tests/moz.build
+++ b/js/ipc/tests/moz.build
@@ -6,3 +6,6 @@
 
 MODULE = 'test_jsipc'
 
+# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
+if CONFIG['OS_ARCH'] != 'Darwin':
+    XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/js/jsd/Makefile.in b/js/jsd/Makefile.in
index 400b0c475eb..500cf5c792e 100644
--- a/js/jsd/Makefile.in
+++ b/js/jsd/Makefile.in
@@ -24,7 +24,7 @@ LIBXUL_LIBRARY = 1
 MODULE_NAME = JavaScript_Debugger
 EXPORT_LIBRARY = 1
 
-XPCSHELL_TESTS  = test
+DISABLED_XPCSHELL_TESTS  = test
 
 # REQUIRES	= java js
 
diff --git a/js/jsd/moz.build b/js/jsd/moz.build
index b8c5b18f66f..120bd3ab9e4 100644
--- a/js/jsd/moz.build
+++ b/js/jsd/moz.build
@@ -13,3 +13,4 @@ EXPORTS += [
     'jsdebug.h',
 ]
 
+XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini']
diff --git a/js/xpconnect/tests/Makefile.in b/js/xpconnect/tests/Makefile.in
index 7e547404f74..3cabc8d9f0a 100644
--- a/js/xpconnect/tests/Makefile.in
+++ b/js/xpconnect/tests/Makefile.in
@@ -11,7 +11,7 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 LIBS = \
   $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
diff --git a/js/xpconnect/tests/moz.build b/js/xpconnect/tests/moz.build
index 3d198ae810e..57b287ec3c8 100644
--- a/js/xpconnect/tests/moz.build
+++ b/js/xpconnect/tests/moz.build
@@ -12,3 +12,5 @@ DIRS += [
     'components/native',
     'components/js',
 ]
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/layout/tools/layout-debug/tests/Makefile.in b/layout/tools/layout-debug/tests/Makefile.in
index 2a048800eff..c2ce8c0df09 100644
--- a/layout/tools/layout-debug/tests/Makefile.in
+++ b/layout/tools/layout-debug/tests/Makefile.in
@@ -12,6 +12,6 @@ relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/layout/tools/layout-debug/tests/moz.build b/layout/tools/layout-debug/tests/moz.build
index 895d11993cf..191c90f0b92 100644
--- a/layout/tools/layout-debug/tests/moz.build
+++ b/layout/tools/layout-debug/tests/moz.build
@@ -4,3 +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/.
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/modules/libjar/test/Makefile.in b/modules/libjar/test/Makefile.in
index 87555f0b264..8a09c0ec1c1 100644
--- a/modules/libjar/test/Makefile.in
+++ b/modules/libjar/test/Makefile.in
@@ -11,6 +11,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/modules/libjar/test/moz.build b/modules/libjar/test/moz.build
index 76f00a19f22..d381f833033 100644
--- a/modules/libjar/test/moz.build
+++ b/modules/libjar/test/moz.build
@@ -8,3 +8,4 @@ DIRS += ['mochitest', 'chrome']
 
 MODULE = 'test_libjar'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/modules/libjar/zipwriter/test/Makefile.in b/modules/libjar/zipwriter/test/Makefile.in
index ed02d33b508..e72f68c2bc3 100644
--- a/modules/libjar/zipwriter/test/Makefile.in
+++ b/modules/libjar/zipwriter/test/Makefile.in
@@ -10,7 +10,7 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = \
+DISABLED_XPCSHELL_TESTS = \
   unit \
   $(NULL)
 
diff --git a/modules/libjar/zipwriter/test/moz.build b/modules/libjar/zipwriter/test/moz.build
index 038f7536bc0..07fb606730f 100644
--- a/modules/libjar/zipwriter/test/moz.build
+++ b/modules/libjar/zipwriter/test/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_zipwriter'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/modules/libmar/tests/Makefile.in b/modules/libmar/tests/Makefile.in
index ee45e619200..1ba64537055 100644
--- a/modules/libmar/tests/Makefile.in
+++ b/modules/libmar/tests/Makefile.in
@@ -10,7 +10,7 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = \
+DISABLED_XPCSHELL_TESTS = \
   unit \
   $(NULL)
 
diff --git a/modules/libmar/tests/moz.build b/modules/libmar/tests/moz.build
index 895d11993cf..191c90f0b92 100644
--- a/modules/libmar/tests/moz.build
+++ b/modules/libmar/tests/moz.build
@@ -4,3 +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/.
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/modules/libpref/test/Makefile.in b/modules/libpref/test/Makefile.in
index 866477e2488..235d9bb4a8f 100644
--- a/modules/libpref/test/Makefile.in
+++ b/modules/libpref/test/Makefile.in
@@ -11,11 +11,11 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
 ifneq ($(OS_ARCH),Darwin)
-XPCSHELL_TESTS += unit_ipc
+DISABLED_XPCSHELL_TESTS += unit_ipc
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/modules/libpref/test/moz.build b/modules/libpref/test/moz.build
index aa3d89b5c92..26620ac56b6 100644
--- a/modules/libpref/test/moz.build
+++ b/modules/libpref/test/moz.build
@@ -6,3 +6,8 @@
 
 MODULE = 'test_libpref'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
+# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
+if CONFIG['OS_ARCH'] != 'Darwin':
+    XPCSHELL_TESTS_MANIFESTS += ['unit_ipc/xpcshell.ini']
diff --git a/netwerk/cookie/Makefile.in b/netwerk/cookie/Makefile.in
index 658fd7b5687..8e60a8e8d81 100644
--- a/netwerk/cookie/Makefile.in
+++ b/netwerk/cookie/Makefile.in
@@ -23,7 +23,7 @@ CPPSRCS = \
   nsCookieService.cpp \
   $(NULL)
 
-XPCSHELL_TESTS += test/unit
+DISABLED_XPCSHELL_TESTS += test/unit
 
 CPPSRCS += \
 		CookieServiceParent.cpp \
@@ -36,7 +36,7 @@ LOCAL_INCLUDES	= \
 
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
 ifneq ($(OS_ARCH),Darwin)
-XPCSHELL_TESTS += test/unit_ipc
+DISABLED_XPCSHELL_TESTS += test/unit_ipc
 endif
 endif
 
diff --git a/netwerk/cookie/moz.build b/netwerk/cookie/moz.build
index 518c5ce902e..0edbb9c0e3c 100644
--- a/netwerk/cookie/moz.build
+++ b/netwerk/cookie/moz.build
@@ -22,3 +22,10 @@ if CONFIG['NECKO_COOKIES']:
         'CookieServiceParent.h',
         'CookieServiceChild.h',
     ]
+
+if CONFIG['NECKO_COOKIES']:
+    XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
+
+# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
+if CONFIG['NECKO_COOKIES'] and CONFIG['OS_ARCH'] != 'Darwin':
+    XPCSHELL_TESTS_MANIFESTS += ['test/unit_ipc/xpcshell.ini']
diff --git a/netwerk/test/Makefile.in b/netwerk/test/Makefile.in
index 15973c94ae3..2bdf0c21c0d 100644
--- a/netwerk/test/Makefile.in
+++ b/netwerk/test/Makefile.in
@@ -60,10 +60,10 @@ LIBS		= $(EXTRA_DSO_LIBS) \
 
 DEFINES += $(TK_CFLAGS)
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
 ifneq ($(OS_ARCH),Darwin)
-XPCSHELL_TESTS += unit_ipc
+DISABLED_XPCSHELL_TESTS += unit_ipc
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/netwerk/test/httpserver/Makefile.in b/netwerk/test/httpserver/Makefile.in
index 27a9f6de3e4..fd7c054809f 100644
--- a/netwerk/test/httpserver/Makefile.in
+++ b/netwerk/test/httpserver/Makefile.in
@@ -27,7 +27,7 @@ EXTRA_COMPONENTS += \
                    $(NULL)
 endif
 
-XPCSHELL_TESTS = test
+DISABLED_XPCSHELL_TESTS = test
 
 TESTING_JS_MODULES = httpd.js
 
diff --git a/netwerk/test/httpserver/moz.build b/netwerk/test/httpserver/moz.build
index a3c73cc2666..1c856a05478 100644
--- a/netwerk/test/httpserver/moz.build
+++ b/netwerk/test/httpserver/moz.build
@@ -10,3 +10,4 @@ XPIDL_SOURCES += [
 
 MODULE = 'test_necko'
 
+XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini']
diff --git a/netwerk/test/moz.build b/netwerk/test/moz.build
index eedad6ce1a3..3a5d28eda21 100644
--- a/netwerk/test/moz.build
+++ b/netwerk/test/moz.build
@@ -8,3 +8,8 @@ TEST_DIRS += ['httpserver', 'browser']
 
 MODULE = 'test_necko'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
+# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
+if CONFIG['OS_ARCH'] != 'Darwin':
+    XPCSHELL_TESTS_MANIFESTS += ['unit_ipc/xpcshell.ini']
diff --git a/parser/xml/test/Makefile.in b/parser/xml/test/Makefile.in
index 9a00a55a7a2..b86cab3125a 100644
--- a/parser/xml/test/Makefile.in
+++ b/parser/xml/test/Makefile.in
@@ -21,6 +21,6 @@ relativesrcdir = @relativesrcdir@
 include $(DEPTH)/config/autoconf.mk
 
 # Note: set the test module's name to test_<yourmodule>
-XPCSHELL_TESTS  = unit
+DISABLED_XPCSHELL_TESTS  = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/parser/xml/test/moz.build b/parser/xml/test/moz.build
index a0e7c86ac72..eaf76599867 100644
--- a/parser/xml/test/moz.build
+++ b/parser/xml/test/moz.build
@@ -6,3 +6,5 @@
 
 MODULE = 'test_xmlreader'
 
+# Note: set the test module's name to test_<yourmodule>
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/rdf/tests/Makefile.in b/rdf/tests/Makefile.in
index 5b427af8b16..72524b735d4 100644
--- a/rdf/tests/Makefile.in
+++ b/rdf/tests/Makefile.in
@@ -11,7 +11,7 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/rdf/tests/moz.build b/rdf/tests/moz.build
index 30fa5defe0c..bb8b9b0faa6 100644
--- a/rdf/tests/moz.build
+++ b/rdf/tests/moz.build
@@ -8,3 +8,4 @@ DIRS += ['rdfcat', 'rdfpoll', 'triplescat']
 
 MODULE = 'test_rdf'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/security/manager/ssl/tests/Makefile.in b/security/manager/ssl/tests/Makefile.in
index ebc8dd777b2..307cb62e3df 100644
--- a/security/manager/ssl/tests/Makefile.in
+++ b/security/manager/ssl/tests/Makefile.in
@@ -8,6 +8,6 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir = @relativesrcdir@
 
-XPCSHELL_TESTS  = unit
+DISABLED_XPCSHELL_TESTS  = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/security/manager/ssl/tests/moz.build b/security/manager/ssl/tests/moz.build
index 16453831d25..157346558e2 100644
--- a/security/manager/ssl/tests/moz.build
+++ b/security/manager/ssl/tests/moz.build
@@ -8,3 +8,4 @@ TEST_DIRS += ['mochitest']
 
 MODULE = 'pipnss'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/services/common/tests/Makefile.in b/services/common/tests/Makefile.in
index 4fb4b51435c..ae707bdc176 100644
--- a/services/common/tests/Makefile.in
+++ b/services/common/tests/Makefile.in
@@ -10,6 +10,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/services/common/tests/moz.build b/services/common/tests/moz.build
index 06ce9c97263..56a8d300422 100644
--- a/services/common/tests/moz.build
+++ b/services/common/tests/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_services_common'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/services/crypto/component/tests/Makefile.in b/services/crypto/component/tests/Makefile.in
index 373023593ed..790f441e0d1 100644
--- a/services/crypto/component/tests/Makefile.in
+++ b/services/crypto/component/tests/Makefile.in
@@ -11,6 +11,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/services/crypto/component/tests/moz.build b/services/crypto/component/tests/moz.build
index 96597af2700..bbcde2097dd 100644
--- a/services/crypto/component/tests/moz.build
+++ b/services/crypto/component/tests/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_services_crypto'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/services/crypto/tests/Makefile.in b/services/crypto/tests/Makefile.in
index 373023593ed..790f441e0d1 100644
--- a/services/crypto/tests/Makefile.in
+++ b/services/crypto/tests/Makefile.in
@@ -11,6 +11,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/services/crypto/tests/moz.build b/services/crypto/tests/moz.build
index 96597af2700..bbcde2097dd 100644
--- a/services/crypto/tests/moz.build
+++ b/services/crypto/tests/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_services_crypto'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/services/datareporting/tests/Makefile.in b/services/datareporting/tests/Makefile.in
index 2332dc0cc9c..8e8c5314a4b 100644
--- a/services/datareporting/tests/Makefile.in
+++ b/services/datareporting/tests/Makefile.in
@@ -10,7 +10,7 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = xpcshell
+DISABLED_XPCSHELL_TESTS = xpcshell
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/services/datareporting/tests/moz.build b/services/datareporting/tests/moz.build
index 1afe23d0279..56e6d769415 100644
--- a/services/datareporting/tests/moz.build
+++ b/services/datareporting/tests/moz.build
@@ -3,3 +3,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/.
 
+XPCSHELL_TESTS_MANIFESTS += ['xpcshell/xpcshell.ini']
diff --git a/services/healthreport/tests/Makefile.in b/services/healthreport/tests/Makefile.in
index 85f9980a034..d2cdcb57a3f 100644
--- a/services/healthreport/tests/Makefile.in
+++ b/services/healthreport/tests/Makefile.in
@@ -10,6 +10,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = xpcshell
+DISABLED_XPCSHELL_TESTS = xpcshell
 
 include $(topsrcdir)/config/rules.mk
diff --git a/services/healthreport/tests/moz.build b/services/healthreport/tests/moz.build
index 895d11993cf..dcad37e80e1 100644
--- a/services/healthreport/tests/moz.build
+++ b/services/healthreport/tests/moz.build
@@ -4,3 +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/.
 
+XPCSHELL_TESTS_MANIFESTS += ['xpcshell/xpcshell.ini']
diff --git a/services/metrics/tests/Makefile.in b/services/metrics/tests/Makefile.in
index 85f9980a034..d2cdcb57a3f 100644
--- a/services/metrics/tests/Makefile.in
+++ b/services/metrics/tests/Makefile.in
@@ -10,6 +10,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = xpcshell
+DISABLED_XPCSHELL_TESTS = xpcshell
 
 include $(topsrcdir)/config/rules.mk
diff --git a/services/metrics/tests/moz.build b/services/metrics/tests/moz.build
index 895d11993cf..dcad37e80e1 100644
--- a/services/metrics/tests/moz.build
+++ b/services/metrics/tests/moz.build
@@ -4,3 +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/.
 
+XPCSHELL_TESTS_MANIFESTS += ['xpcshell/xpcshell.ini']
diff --git a/services/sync/tests/Makefile.in b/services/sync/tests/Makefile.in
index 373023593ed..790f441e0d1 100644
--- a/services/sync/tests/Makefile.in
+++ b/services/sync/tests/Makefile.in
@@ -11,6 +11,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/services/sync/tests/moz.build b/services/sync/tests/moz.build
index 438f0e68fc5..a1067b49f4c 100644
--- a/services/sync/tests/moz.build
+++ b/services/sync/tests/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_services_sync'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/storage/test/Makefile.in b/storage/test/Makefile.in
index 762144b602e..9f9c50c8a08 100644
--- a/storage/test/Makefile.in
+++ b/storage/test/Makefile.in
@@ -11,7 +11,7 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 CPP_UNIT_TESTS = \
   test_transaction_helper.cpp \
diff --git a/storage/test/moz.build b/storage/test/moz.build
index 9c1dc9ff81a..069738ecfdd 100644
--- a/storage/test/moz.build
+++ b/storage/test/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_storage'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/testing/xpcshell/example/Makefile.in b/testing/xpcshell/example/Makefile.in
index 2399207322d..ea35b880ca9 100644
--- a/testing/xpcshell/example/Makefile.in
+++ b/testing/xpcshell/example/Makefile.in
@@ -22,7 +22,7 @@ include $(DEPTH)/config/autoconf.mk
 
 # This is a list of directories containing tests to run, separated by spaces.
 # Most likely, tho, you won't use more than one directory here.
-XPCSHELL_TESTS = \
+DISABLED_XPCSHELL_TESTS = \
                  unit \
                  $(NULL)
 
diff --git a/testing/xpcshell/example/moz.build b/testing/xpcshell/example/moz.build
index f49b85df65a..45827f5a101 100644
--- a/testing/xpcshell/example/moz.build
+++ b/testing/xpcshell/example/moz.build
@@ -6,3 +6,6 @@
 
 MODULE = 'test_testing_xpcshell_example'
 
+# This is a list of directories containing tests to run, separated by spaces.
+# Most likely, tho, you won't use more than one directory here.
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/components/autocomplete/tests/Makefile.in b/toolkit/components/autocomplete/tests/Makefile.in
index 87555f0b264..8a09c0ec1c1 100644
--- a/toolkit/components/autocomplete/tests/Makefile.in
+++ b/toolkit/components/autocomplete/tests/Makefile.in
@@ -11,6 +11,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/autocomplete/tests/moz.build b/toolkit/components/autocomplete/tests/moz.build
index c470bf5ce54..42d6e82cd62 100644
--- a/toolkit/components/autocomplete/tests/moz.build
+++ b/toolkit/components/autocomplete/tests/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_autocomplete'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/components/captivedetect/test/Makefile.in b/toolkit/components/captivedetect/test/Makefile.in
index 497558f11e4..697c18ff704 100644
--- a/toolkit/components/captivedetect/test/Makefile.in
+++ b/toolkit/components/captivedetect/test/Makefile.in
@@ -10,6 +10,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/captivedetect/test/moz.build b/toolkit/components/captivedetect/test/moz.build
index 1d3ef82f514..b92becca19e 100644
--- a/toolkit/components/captivedetect/test/moz.build
+++ b/toolkit/components/captivedetect/test/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_captivedetect'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/components/commandlines/test/Makefile.in b/toolkit/components/commandlines/test/Makefile.in
index a108284f4c0..38a04148f16 100644
--- a/toolkit/components/commandlines/test/Makefile.in
+++ b/toolkit/components/commandlines/test/Makefile.in
@@ -11,15 +11,15 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = \
+DISABLED_XPCSHELL_TESTS = \
                  unit \
                  $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
-XPCSHELL_TESTS += unit_win
+DISABLED_XPCSHELL_TESTS += unit_win
 else
 ifneq (,$(filter-out OS2 Darwin,$(OS_ARCH)))
-XPCSHELL_TESTS += unit_unix
+DISABLED_XPCSHELL_TESTS += unit_unix
 endif
 endif
 
diff --git a/toolkit/components/commandlines/test/moz.build b/toolkit/components/commandlines/test/moz.build
index 7b9bd7a3143..76c137438cd 100644
--- a/toolkit/components/commandlines/test/moz.build
+++ b/toolkit/components/commandlines/test/moz.build
@@ -6,3 +6,10 @@
 
 MODULE = 'test_harness_commandlines'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    XPCSHELL_TESTS_MANIFESTS += ['unit_win/xpcshell.ini']
+
+if CONFIG['OS_ARCH'] != 'WINNT' and CONFIG['OS_ARCH'] not in ('Darwin', 'OS2'):
+    XPCSHELL_TESTS_MANIFESTS += ['unit_unix/xpcshell.ini']
diff --git a/toolkit/components/contentprefs/tests/Makefile.in b/toolkit/components/contentprefs/tests/Makefile.in
index 06d9455fad1..b831e527524 100644
--- a/toolkit/components/contentprefs/tests/Makefile.in
+++ b/toolkit/components/contentprefs/tests/Makefile.in
@@ -11,11 +11,11 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit unit_cps2
+DISABLED_XPCSHELL_TESTS = unit unit_cps2
 
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
 ifneq ($(OS_ARCH),Darwin)
-XPCSHELL_TESTS += unit_ipc
+DISABLED_XPCSHELL_TESTS += unit_ipc
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/contentprefs/tests/moz.build b/toolkit/components/contentprefs/tests/moz.build
index 1727cbaedd5..f199dd55e9c 100644
--- a/toolkit/components/contentprefs/tests/moz.build
+++ b/toolkit/components/contentprefs/tests/moz.build
@@ -6,3 +6,8 @@
 
 MODULE = 'test_toolkit_contentprefs'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini', 'unit_cps2/xpcshell.ini']
+
+# FIXME/bug 575918: out-of-process xpcshell is broken on OS X
+if CONFIG['OS_ARCH'] != 'Darwin':
+    XPCSHELL_TESTS_MANIFESTS += ['unit_ipc/xpcshell.ini']
diff --git a/toolkit/components/ctypes/tests/Makefile.in b/toolkit/components/ctypes/tests/Makefile.in
index f2656916b4e..a757f20da65 100644
--- a/toolkit/components/ctypes/tests/Makefile.in
+++ b/toolkit/components/ctypes/tests/Makefile.in
@@ -26,7 +26,7 @@ LOCAL_INCLUDES = \
 
 EXTRA_DSO_LDOPTS += $(MOZALLOC_LIB)
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 # should be MOCHITEST_CHROME_FILES, see bug 770938
 MOCHITEST_CHROME_TESTS = \
diff --git a/toolkit/components/ctypes/tests/moz.build b/toolkit/components/ctypes/tests/moz.build
index 180abd5739d..a18b45ee821 100644
--- a/toolkit/components/ctypes/tests/moz.build
+++ b/toolkit/components/ctypes/tests/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'jsctypes-test'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/components/downloads/test/Makefile.in b/toolkit/components/downloads/test/Makefile.in
index c0889bec60d..bd27e29f85b 100644
--- a/toolkit/components/downloads/test/Makefile.in
+++ b/toolkit/components/downloads/test/Makefile.in
@@ -11,7 +11,7 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = \
+DISABLED_XPCSHELL_TESTS = \
   unit \
   schema_migration \
   $(NULL)
diff --git a/toolkit/components/downloads/test/moz.build b/toolkit/components/downloads/test/moz.build
index a19a0cebd3b..577ebbe372a 100644
--- a/toolkit/components/downloads/test/moz.build
+++ b/toolkit/components/downloads/test/moz.build
@@ -8,3 +8,4 @@ TEST_DIRS += ['browser']
 
 MODULE = 'test_dm'
 
+XPCSHELL_TESTS_MANIFESTS += ['schema_migration/xpcshell.ini', 'unit/xpcshell.ini']
diff --git a/toolkit/components/jsdownloads/test/Makefile.in b/toolkit/components/jsdownloads/test/Makefile.in
index 7002adf1e0f..f64f04aa64f 100644
--- a/toolkit/components/jsdownloads/test/Makefile.in
+++ b/toolkit/components/jsdownloads/test/Makefile.in
@@ -10,6 +10,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/jsdownloads/test/moz.build b/toolkit/components/jsdownloads/test/moz.build
index d185b872338..c0641b46054 100644
--- a/toolkit/components/jsdownloads/test/moz.build
+++ b/toolkit/components/jsdownloads/test/moz.build
@@ -6,3 +6,4 @@
 
 TEST_DIRS += ['data']
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/components/mediasniffer/test/Makefile.in b/toolkit/components/mediasniffer/test/Makefile.in
index 497558f11e4..697c18ff704 100644
--- a/toolkit/components/mediasniffer/test/Makefile.in
+++ b/toolkit/components/mediasniffer/test/Makefile.in
@@ -10,6 +10,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/mediasniffer/test/moz.build b/toolkit/components/mediasniffer/test/moz.build
index cb08825b37b..8bd52f48dc5 100644
--- a/toolkit/components/mediasniffer/test/moz.build
+++ b/toolkit/components/mediasniffer/test/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_mediasniffer'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/components/osfile/tests/Makefile.in b/toolkit/components/osfile/tests/Makefile.in
index 5cf9e3927c2..b7c05800c62 100644
--- a/toolkit/components/osfile/tests/Makefile.in
+++ b/toolkit/components/osfile/tests/Makefile.in
@@ -8,7 +8,7 @@ srcdir           = @srcdir@
 VPATH            = @srcdir@
 relativesrcdir   = @relativesrcdir@
 
-XPCSHELL_TESTS = xpcshell
+DISABLED_XPCSHELL_TESTS = xpcshell
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/osfile/tests/moz.build b/toolkit/components/osfile/tests/moz.build
index 3c1f41a3cbf..7886b7c3b7e 100644
--- a/toolkit/components/osfile/tests/moz.build
+++ b/toolkit/components/osfile/tests/moz.build
@@ -8,3 +8,4 @@ TEST_DIRS += ['mochi']
 
 MODULE = 'test_osfile'
 
+XPCSHELL_TESTS_MANIFESTS += ['xpcshell/xpcshell.ini']
diff --git a/toolkit/components/passwordmgr/test/Makefile.in b/toolkit/components/passwordmgr/test/Makefile.in
index eb986ce2b72..00bec54aee2 100644
--- a/toolkit/components/passwordmgr/test/Makefile.in
+++ b/toolkit/components/passwordmgr/test/Makefile.in
@@ -12,7 +12,7 @@ relativesrcdir = @relativesrcdir@
 include $(topsrcdir)/config/config.mk
 
 # Module name for xpcshell tests.
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 # Mochitest tests
 MOCHITEST_FILES = \
diff --git a/toolkit/components/passwordmgr/test/moz.build b/toolkit/components/passwordmgr/test/moz.build
index 8288aab8176..8600db791f0 100644
--- a/toolkit/components/passwordmgr/test/moz.build
+++ b/toolkit/components/passwordmgr/test/moz.build
@@ -8,3 +8,4 @@ TEST_DIRS += ['browser', 'auth2']
 
 MODULE = 'test_passwordmgr'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/components/places/tests/Makefile.in b/toolkit/components/places/tests/Makefile.in
index 4bbb824f254..bf0c8f84b40 100644
--- a/toolkit/components/places/tests/Makefile.in
+++ b/toolkit/components/places/tests/Makefile.in
@@ -10,7 +10,7 @@ relativesrcdir	= @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = \
+DISABLED_XPCSHELL_TESTS = \
   autocomplete \
   bookmarks \
   expiration \
diff --git a/toolkit/components/places/tests/moz.build b/toolkit/components/places/tests/moz.build
index b5f96b1b08a..875141a6113 100644
--- a/toolkit/components/places/tests/moz.build
+++ b/toolkit/components/places/tests/moz.build
@@ -15,3 +15,14 @@ TEST_TOOL_DIRS += ['cpp']
 
 MODULE = 'test_places'
 
+XPCSHELL_TESTS_MANIFESTS += [
+    'autocomplete/xpcshell.ini',
+    'bookmarks/xpcshell.ini',
+    'expiration/xpcshell.ini',
+    'favicons/xpcshell.ini',
+    'inline/xpcshell.ini',
+    'migration/xpcshell.ini',
+    'network/xpcshell.ini',
+    'queries/xpcshell.ini',
+    'unit/xpcshell.ini',
+]
diff --git a/toolkit/components/satchel/test/Makefile.in b/toolkit/components/satchel/test/Makefile.in
index 37753f3e1b4..2ab4effd010 100644
--- a/toolkit/components/satchel/test/Makefile.in
+++ b/toolkit/components/satchel/test/Makefile.in
@@ -10,7 +10,7 @@ relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = \
+DISABLED_XPCSHELL_TESTS = \
   unit \
   $(NULL)
 
diff --git a/toolkit/components/satchel/test/moz.build b/toolkit/components/satchel/test/moz.build
index 110a45ac2c3..79beac5b9e5 100644
--- a/toolkit/components/satchel/test/moz.build
+++ b/toolkit/components/satchel/test/moz.build
@@ -8,3 +8,4 @@ TEST_DIRS += ['browser']
 
 MODULE = 'test_satchel'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/components/search/tests/Makefile.in b/toolkit/components/search/tests/Makefile.in
index a5bbfd752e7..e13e864d798 100644
--- a/toolkit/components/search/tests/Makefile.in
+++ b/toolkit/components/search/tests/Makefile.in
@@ -10,6 +10,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = xpcshell
+DISABLED_XPCSHELL_TESTS = xpcshell
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/search/tests/moz.build b/toolkit/components/search/tests/moz.build
index d39e4fea151..0e6fb547782 100644
--- a/toolkit/components/search/tests/moz.build
+++ b/toolkit/components/search/tests/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_searchservice'
 
+XPCSHELL_TESTS_MANIFESTS += ['xpcshell/xpcshell.ini']
diff --git a/toolkit/components/social/test/Makefile.in b/toolkit/components/social/test/Makefile.in
index 230f4259f40..5db3cf48a38 100644
--- a/toolkit/components/social/test/Makefile.in
+++ b/toolkit/components/social/test/Makefile.in
@@ -10,7 +10,7 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = \
+DISABLED_XPCSHELL_TESTS = \
   xpcshell \
   $(NULL)
 
diff --git a/toolkit/components/social/test/moz.build b/toolkit/components/social/test/moz.build
index 87b36b4d3aa..ad1d46470df 100644
--- a/toolkit/components/social/test/moz.build
+++ b/toolkit/components/social/test/moz.build
@@ -5,3 +5,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['browser']
+
+XPCSHELL_TESTS_MANIFESTS += ['xpcshell/xpcshell.ini']
diff --git a/toolkit/components/startup/Makefile.in b/toolkit/components/startup/Makefile.in
index 9627e6d6af0..e6ec997abc5 100644
--- a/toolkit/components/startup/Makefile.in
+++ b/toolkit/components/startup/Makefile.in
@@ -33,6 +33,6 @@ endif
 endif
 endif
 
-XPCSHELL_TESTS = tests/unit
+DISABLED_XPCSHELL_TESTS = tests/unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/startup/moz.build b/toolkit/components/startup/moz.build
index b2b5ac74209..d2dcd8125a4 100644
--- a/toolkit/components/startup/moz.build
+++ b/toolkit/components/startup/moz.build
@@ -14,3 +14,4 @@ EXPORTS.mozilla += [
     'StartupTimeline.h',
 ]
 
+XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
diff --git a/toolkit/components/telemetry/tests/Makefile.in b/toolkit/components/telemetry/tests/Makefile.in
index 375a973794b..0904aa89ad6 100644
--- a/toolkit/components/telemetry/tests/Makefile.in
+++ b/toolkit/components/telemetry/tests/Makefile.in
@@ -13,7 +13,7 @@ include $(DEPTH)/config/autoconf.mk
 
 #MODULE		= test_harness_telemetry
 
-XPCSHELL_TESTS = \
+DISABLED_XPCSHELL_TESTS = \
                  unit \
                  $(NULL)
 
diff --git a/toolkit/components/telemetry/tests/moz.build b/toolkit/components/telemetry/tests/moz.build
index 895d11993cf..191c90f0b92 100644
--- a/toolkit/components/telemetry/tests/moz.build
+++ b/toolkit/components/telemetry/tests/moz.build
@@ -4,3 +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/.
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/components/url-classifier/tests/Makefile.in b/toolkit/components/url-classifier/tests/Makefile.in
index 15f9f2f2ad2..a2f031f3819 100644
--- a/toolkit/components/url-classifier/tests/Makefile.in
+++ b/toolkit/components/url-classifier/tests/Makefile.in
@@ -14,7 +14,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MOZILLA_INTERNAL_API = 1
 
-XPCSHELL_TESTS=unit
+DISABLED_XPCSHELL_TESTS=unit
 
 # XXX Get this to work in libxul builds.
 ## simple c++ tests (no xpcom)
diff --git a/toolkit/components/url-classifier/tests/moz.build b/toolkit/components/url-classifier/tests/moz.build
index c55830539a8..10632114f99 100644
--- a/toolkit/components/url-classifier/tests/moz.build
+++ b/toolkit/components/url-classifier/tests/moz.build
@@ -8,3 +8,4 @@ TEST_DIRS += ['mochitest']
 
 MODULE = 'test_url-classifier'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/components/urlformatter/tests/Makefile.in b/toolkit/components/urlformatter/tests/Makefile.in
index 497558f11e4..697c18ff704 100644
--- a/toolkit/components/urlformatter/tests/Makefile.in
+++ b/toolkit/components/urlformatter/tests/Makefile.in
@@ -10,6 +10,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/urlformatter/tests/moz.build b/toolkit/components/urlformatter/tests/moz.build
index e50dd55f7e7..a1654c06ffb 100644
--- a/toolkit/components/urlformatter/tests/moz.build
+++ b/toolkit/components/urlformatter/tests/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_urlformatter'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/content/tests/Makefile.in b/toolkit/content/tests/Makefile.in
index 497558f11e4..697c18ff704 100644
--- a/toolkit/content/tests/Makefile.in
+++ b/toolkit/content/tests/Makefile.in
@@ -10,6 +10,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/content/tests/moz.build b/toolkit/content/tests/moz.build
index 940ea16b2d2..2d441176aee 100644
--- a/toolkit/content/tests/moz.build
+++ b/toolkit/content/tests/moz.build
@@ -8,3 +8,4 @@ DIRS += ['chrome', 'widgets', 'browser']
 
 MODULE = 'test_toolkit_general'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/crashreporter/client/Makefile.in b/toolkit/crashreporter/client/Makefile.in
index 0b4852acc0d..caa1223dde2 100644
--- a/toolkit/crashreporter/client/Makefile.in
+++ b/toolkit/crashreporter/client/Makefile.in
@@ -71,7 +71,7 @@ $(DIST)/bin/crashreporter.crt: $(topsrcdir)/security/nss/lib/ckfw/builtins/certd
 
 # The xpcshell test case here verifies that the CA certificate list
 # works with OpenSSL.
-XPCSHELL_TESTS = maemo-unit
+DISABLED_XPCSHELL_TESTS = maemo-unit
 
 else
 CPPSRCS += crashreporter_linux.cpp
diff --git a/toolkit/crashreporter/client/moz.build b/toolkit/crashreporter/client/moz.build
index 2b4a6214c69..c6dbe4973e6 100644
--- a/toolkit/crashreporter/client/moz.build
+++ b/toolkit/crashreporter/client/moz.build
@@ -6,3 +6,6 @@
 
 MODULE = 'crashreporter'
 
+# The xpcshell test case here verifies that the CA certificate list
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2' and CONFIG['MOZ_PLATFORM_MAEMO']:
+    XPCSHELL_TESTS_MANIFESTS += ['maemo-unit/xpcshell.ini']
diff --git a/toolkit/crashreporter/test/Makefile.in b/toolkit/crashreporter/test/Makefile.in
index fa588fd3a1a..f47c97bfc94 100644
--- a/toolkit/crashreporter/test/Makefile.in
+++ b/toolkit/crashreporter/test/Makefile.in
@@ -11,7 +11,7 @@ relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit unit_ipc
+DISABLED_XPCSHELL_TESTS = unit unit_ipc
 
 LIBRARY_NAME = testcrasher
 NO_DIST_INSTALL = 1
diff --git a/toolkit/crashreporter/test/moz.build b/toolkit/crashreporter/test/moz.build
index 99c67ae880e..602ae76328e 100644
--- a/toolkit/crashreporter/test/moz.build
+++ b/toolkit/crashreporter/test/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'crashreporter_test'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini', 'unit_ipc/xpcshell.ini']
diff --git a/toolkit/devtools/debugger/tests/Makefile.in b/toolkit/devtools/debugger/tests/Makefile.in
index 3afec4be6a2..6ac64ac5392 100644
--- a/toolkit/devtools/debugger/tests/Makefile.in
+++ b/toolkit/devtools/debugger/tests/Makefile.in
@@ -10,6 +10,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/devtools/debugger/tests/moz.build b/toolkit/devtools/debugger/tests/moz.build
index 0719f88756d..c963f6bdddc 100644
--- a/toolkit/devtools/debugger/tests/moz.build
+++ b/toolkit/devtools/debugger/tests/moz.build
@@ -7,3 +7,5 @@
 DIRS += ['mochitest']
 
 MODULE = 'test_debugger'
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/devtools/sourcemap/tests/Makefile.in b/toolkit/devtools/sourcemap/tests/Makefile.in
index e28e10ac3a2..5e499dc7a2f 100644
--- a/toolkit/devtools/sourcemap/tests/Makefile.in
+++ b/toolkit/devtools/sourcemap/tests/Makefile.in
@@ -10,6 +10,6 @@ relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS  = unit
+DISABLED_XPCSHELL_TESTS  = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/devtools/sourcemap/tests/moz.build b/toolkit/devtools/sourcemap/tests/moz.build
index 858d68a73dc..0a99e4f9ac4 100644
--- a/toolkit/devtools/sourcemap/tests/moz.build
+++ b/toolkit/devtools/sourcemap/tests/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_sourcemap'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/forgetaboutsite/test/Makefile.in b/toolkit/forgetaboutsite/test/Makefile.in
index 5f6decddb65..fb92d0ebb66 100644
--- a/toolkit/forgetaboutsite/test/Makefile.in
+++ b/toolkit/forgetaboutsite/test/Makefile.in
@@ -10,6 +10,6 @@ relativesrcdir := @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS := unit
+DISABLED_XPCSHELL_TESTS := unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/forgetaboutsite/test/moz.build b/toolkit/forgetaboutsite/test/moz.build
index bf3bf13be7c..cefdd59ca1f 100644
--- a/toolkit/forgetaboutsite/test/moz.build
+++ b/toolkit/forgetaboutsite/test/moz.build
@@ -8,3 +8,4 @@ DIRS += ['browser']
 
 MODULE = 'forgetaboutsite'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/identity/tests/Makefile.in b/toolkit/identity/tests/Makefile.in
index 4fb4b51435c..ae707bdc176 100644
--- a/toolkit/identity/tests/Makefile.in
+++ b/toolkit/identity/tests/Makefile.in
@@ -10,6 +10,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/identity/tests/moz.build b/toolkit/identity/tests/moz.build
index c919f97dc26..62c72b31a5d 100644
--- a/toolkit/identity/tests/moz.build
+++ b/toolkit/identity/tests/moz.build
@@ -8,3 +8,4 @@ DIRS += ['chrome', 'mochitest']
 
 MODULE = 'test_identity'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/modules/tests/Makefile.in b/toolkit/modules/tests/Makefile.in
index 2332dc0cc9c..8e8c5314a4b 100644
--- a/toolkit/modules/tests/Makefile.in
+++ b/toolkit/modules/tests/Makefile.in
@@ -10,7 +10,7 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = xpcshell
+DISABLED_XPCSHELL_TESTS = xpcshell
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/toolkit/modules/tests/moz.build b/toolkit/modules/tests/moz.build
index 895d11993cf..dcad37e80e1 100644
--- a/toolkit/modules/tests/moz.build
+++ b/toolkit/modules/tests/moz.build
@@ -4,3 +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/.
 
+XPCSHELL_TESTS_MANIFESTS += ['xpcshell/xpcshell.ini']
diff --git a/toolkit/mozapps/downloads/tests/Makefile.in b/toolkit/mozapps/downloads/tests/Makefile.in
index 89fb2235f0a..26f3cce9228 100644
--- a/toolkit/mozapps/downloads/tests/Makefile.in
+++ b/toolkit/mozapps/downloads/tests/Makefile.in
@@ -11,7 +11,7 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = \
+DISABLED_XPCSHELL_TESTS = \
   unit \
   $(NULL)
 
diff --git a/toolkit/mozapps/downloads/tests/moz.build b/toolkit/mozapps/downloads/tests/moz.build
index c83e8026576..d7aa15f5f8d 100644
--- a/toolkit/mozapps/downloads/tests/moz.build
+++ b/toolkit/mozapps/downloads/tests/moz.build
@@ -8,3 +8,4 @@ DIRS += ['chrome']
 
 MODULE = 'test_downloads'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/mozapps/extensions/test/Makefile.in b/toolkit/mozapps/extensions/test/Makefile.in
index 9e263d57b2d..62edfed955e 100644
--- a/toolkit/mozapps/extensions/test/Makefile.in
+++ b/toolkit/mozapps/extensions/test/Makefile.in
@@ -14,7 +14,7 @@ TESTXPI = $(TESTROOT)/xpcshell/addons
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = \
+DISABLED_XPCSHELL_TESTS = \
   xpcshell \
   xpcshell-unpack \
   $(NULL)
diff --git a/toolkit/mozapps/extensions/test/moz.build b/toolkit/mozapps/extensions/test/moz.build
index 143864a51d9..0d19badbb8f 100644
--- a/toolkit/mozapps/extensions/test/moz.build
+++ b/toolkit/mozapps/extensions/test/moz.build
@@ -9,3 +9,4 @@ if CONFIG['MOZ_BUILD_APP'] != 'mobile':
 
 MODULE = 'test_extensionmanager'
 
+XPCSHELL_TESTS_MANIFESTS += ['xpcshell-unpack/xpcshell.ini', 'xpcshell/xpcshell.ini']
diff --git a/toolkit/mozapps/shared/Makefile.in b/toolkit/mozapps/shared/Makefile.in
index 375dc0042ed..8c33f27783d 100644
--- a/toolkit/mozapps/shared/Makefile.in
+++ b/toolkit/mozapps/shared/Makefile.in
@@ -19,7 +19,7 @@ EXTRA_JS_MODULES = \
   $(NULL)
 
 ifdef ENABLE_TESTS
-XPCSHELL_TESTS = test/unit
+DISABLED_XPCSHELL_TESTS = test/unit
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/mozapps/shared/moz.build b/toolkit/mozapps/shared/moz.build
index 152e95416c7..093cc66f678 100644
--- a/toolkit/mozapps/shared/moz.build
+++ b/toolkit/mozapps/shared/moz.build
@@ -8,3 +8,5 @@ TEST_DIRS += ['test/chrome']
 
 MODULE = 'toolkitShared'
 
+if CONFIG['ENABLE_TESTS']:
+    XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
diff --git a/toolkit/mozapps/update/test/Makefile.in b/toolkit/mozapps/update/test/Makefile.in
index 4997412aeb2..4729c5354c2 100644
--- a/toolkit/mozapps/update/test/Makefile.in
+++ b/toolkit/mozapps/update/test/Makefile.in
@@ -10,7 +10,7 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = \
+DISABLED_XPCSHELL_TESTS = \
   unit \
   $(NULL)
 
diff --git a/toolkit/mozapps/update/test/moz.build b/toolkit/mozapps/update/test/moz.build
index eb3c7a362b6..7e89689f3b2 100644
--- a/toolkit/mozapps/update/test/moz.build
+++ b/toolkit/mozapps/update/test/moz.build
@@ -6,3 +6,5 @@
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     DIRS += ['chrome']
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/mozapps/update/test_svc/Makefile.in b/toolkit/mozapps/update/test_svc/Makefile.in
index b024e361d1e..4dc8d1bd6a0 100644
--- a/toolkit/mozapps/update/test_svc/Makefile.in
+++ b/toolkit/mozapps/update/test_svc/Makefile.in
@@ -10,7 +10,7 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = \
+DISABLED_XPCSHELL_TESTS = \
   unit \
   $(NULL)
 
diff --git a/toolkit/mozapps/update/test_svc/moz.build b/toolkit/mozapps/update/test_svc/moz.build
index 895d11993cf..191c90f0b92 100644
--- a/toolkit/mozapps/update/test_svc/moz.build
+++ b/toolkit/mozapps/update/test_svc/moz.build
@@ -4,3 +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/.
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/toolkit/mozapps/update/test_timermanager/Makefile.in b/toolkit/mozapps/update/test_timermanager/Makefile.in
index 75f0abaa848..1d34293dd36 100644
--- a/toolkit/mozapps/update/test_timermanager/Makefile.in
+++ b/toolkit/mozapps/update/test_timermanager/Makefile.in
@@ -10,6 +10,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/mozapps/update/test_timermanager/moz.build b/toolkit/mozapps/update/test_timermanager/moz.build
index f27ad8c7bb7..bb1ee423466 100644
--- a/toolkit/mozapps/update/test_timermanager/moz.build
+++ b/toolkit/mozapps/update/test_timermanager/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_timermanager'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/tools/profiler/Makefile.in b/tools/profiler/Makefile.in
index f9fa46ce595..9c508151263 100644
--- a/tools/profiler/Makefile.in
+++ b/tools/profiler/Makefile.in
@@ -10,7 +10,7 @@ srcdir      = @srcdir@
 VPATH       = $(srcdir)
 relativesrcdir = @relativesrcdir@
 
-XPCSHELL_TESTS = tests
+DISABLED_XPCSHELL_TESTS = tests
 
 include $(DEPTH)/config/autoconf.mk
 
diff --git a/tools/profiler/moz.build b/tools/profiler/moz.build
index f8dc0acd14e..c60b8ad7c6d 100644
--- a/tools/profiler/moz.build
+++ b/tools/profiler/moz.build
@@ -21,3 +21,4 @@ EXPORTS += [
     'GeckoProfiler.h',
 ]
 
+XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
diff --git a/uriloader/exthandler/tests/Makefile.in b/uriloader/exthandler/tests/Makefile.in
index 57e9e02bf71..6cedf2fb8d1 100644
--- a/uriloader/exthandler/tests/Makefile.in
+++ b/uriloader/exthandler/tests/Makefile.in
@@ -10,12 +10,12 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS  = unit
+DISABLED_XPCSHELL_TESTS  = unit
 FAIL_ON_WARNINGS = 1
 
 #FIXME/bug 575918: out-of-process xpcshell is broken on OS X
 ifneq ($(OS_ARCH),Darwin)
-XPCSHELL_TESTS += unit_ipc
+DISABLED_XPCSHELL_TESTS += unit_ipc
 endif
 
 CPPSRCS =	\
diff --git a/uriloader/exthandler/tests/moz.build b/uriloader/exthandler/tests/moz.build
index 2533f65cf8c..31d78d0e3e7 100644
--- a/uriloader/exthandler/tests/moz.build
+++ b/uriloader/exthandler/tests/moz.build
@@ -8,3 +8,8 @@ DIRS += ['mochitest']
 
 MODULE = 'test_uriloader_exthandler'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
+#FIXME/bug 575918: out-of-process xpcshell is broken on OS X
+if CONFIG['OS_ARCH'] != 'Darwin':
+    XPCSHELL_TESTS_MANIFESTS += ['unit_ipc/xpcshell.ini']
diff --git a/widget/tests/Makefile.in b/widget/tests/Makefile.in
index 23d69466811..507d61c32f5 100644
--- a/widget/tests/Makefile.in
+++ b/widget/tests/Makefile.in
@@ -12,7 +12,7 @@ FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
-XPCSHELL_TESTS  = unit
+DISABLED_XPCSHELL_TESTS  = unit
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 
diff --git a/widget/tests/moz.build b/widget/tests/moz.build
index bc4c443b3f8..9bd05e4013c 100644
--- a/widget/tests/moz.build
+++ b/widget/tests/moz.build
@@ -6,3 +6,4 @@
 
 MODULE = 'test_widget'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in
index 9e974f2f16e..7ba1f33899a 100644
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@@ -113,7 +113,7 @@ ifeq ($(OS_ARCH)$(OS_RELEASE),FreeBSD2)
 LIBS		+= -lpcap
 endif
 
-XPCSHELL_TESTS = unit
+DISABLED_XPCSHELL_TESTS = unit
 
 # Make sure we have symbols in case we need to debug these.
 MOZ_DEBUG_SYMBOLS = 1
diff --git a/xpcom/tests/moz.build b/xpcom/tests/moz.build
index 68d027894d0..7a4ac343952 100644
--- a/xpcom/tests/moz.build
+++ b/xpcom/tests/moz.build
@@ -19,3 +19,4 @@ if CONFIG['DEHYDRA_PATH']:
 
 MODULE = 'xpcom'
 
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']