diff -r 000000000000 -r 6474c204b198 modules/libpref/test/moz.build
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/libpref/test/moz.build	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,11 @@
+# -*- 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/.
+
+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']