diff --git a/docshell/test/Makefile.in b/docshell/test/Makefile.in
index d0c98840919f..1be74463b696 100644
--- a/docshell/test/Makefile.in
+++ b/docshell/test/Makefile.in
@@ -44,10 +44,13 @@ relativesrcdir  = docshell/test
 MODULE = test_docshell
 
 DIRS += chrome \
-	browser \
 	navigation \
 	$(NULL)
 
+ifeq (browser,$(MOZ_BUILD_APP))
+	DIRS += browser
+endif
+
 XPCSHELL_TESTS = unit
 
 include $(DEPTH)/config/autoconf.mk
diff --git a/dom/tests/Makefile.in b/dom/tests/Makefile.in
index 8750807ccb33..690dabc95870 100644
--- a/dom/tests/Makefile.in
+++ b/dom/tests/Makefile.in
@@ -45,9 +45,12 @@ include $(DEPTH)/config/autoconf.mk
 MODULE = test_dom
 
 DIRS		+= mochitest \
-		browser \
 		$(NULL)
 XPCSHELL_TESTS = unit
 
+ifeq (browser,$(MOZ_BUILD_APP))
+	dirs += browser
+endif
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/layout/style/test/Makefile.in b/layout/style/test/Makefile.in
index 168266e98733..d09d55ae2529 100644
--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -219,11 +219,13 @@ _VISITED_REFTEST_FILES = \
 		$(topsrcdir)/layout/reftests/svg/pseudo-classes-02-ref.svg \
 		$(NULL)
 
+ifeq (browser,$(MOZ_BUILD_APP))
 _BROWSER_FILES = \
 		browser_bug453896.js \
 		bug453896_iframe.html \
 		media_queries_iframe.html \
 		$(NULL)
+endif
 
 libs:: $(_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
@@ -231,5 +233,7 @@ libs:: $(_TEST_FILES)
 libs:: $(_VISITED_REFTEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)/css-visited/
 
+ifeq (browser,$(MOZ_BUILD_APP))
 libs:: $(_BROWSER_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+endif
diff --git a/toolkit/components/downloads/test/Makefile.in b/toolkit/components/downloads/test/Makefile.in
index b12a337cc838..376c9624b980 100644
--- a/toolkit/components/downloads/test/Makefile.in
+++ b/toolkit/components/downloads/test/Makefile.in
@@ -50,9 +50,11 @@ XPCSHELL_TESTS = \
   schema_migration \
   $(NULL)
 
+ifeq (browser,$(MOZ_BUILD_APP))
 DIRS = \
   browser \
   $(NULL)
+endif
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/toolkit/components/passwordmgr/test/Makefile.in b/toolkit/components/passwordmgr/test/Makefile.in
index 120ee33f7ab3..2a7e597ba449 100644
--- a/toolkit/components/passwordmgr/test/Makefile.in
+++ b/toolkit/components/passwordmgr/test/Makefile.in
@@ -43,9 +43,11 @@ relativesrcdir  = toolkit/components/passwordmgr/test
 
 include $(DEPTH)/config/autoconf.mk
 
+ifeq (browser,$(MOZ_BUILD_APP))
 DIRS = \
 	browser \
 	$(NULL)
+endif
 
 # Module name for xpcshell tests.
 MODULE		= test_passwordmgr
diff --git a/toolkit/components/places/tests/Makefile.in b/toolkit/components/places/tests/Makefile.in
index 894be665c7aa..179adfee60bb 100644
--- a/toolkit/components/places/tests/Makefile.in
+++ b/toolkit/components/places/tests/Makefile.in
@@ -71,9 +71,12 @@ DIRS = \
 	chrome \
 	mochitest/bug_411966 \
 	mochitest/bug_461710 \
-	browser \
 	$(NULL)
 
+ifeq (browser,$(MOZ_BUILD_APP))
+	DIRS += browser
+endif
+
 TOOL_DIRS = \
   cpp \
   $(NULL)
diff --git a/toolkit/components/startup/tests/Makefile.in b/toolkit/components/startup/tests/Makefile.in
index 9c9628e54dd0..8cdfa37375d1 100644
--- a/toolkit/components/startup/tests/Makefile.in
+++ b/toolkit/components/startup/tests/Makefile.in
@@ -42,8 +42,10 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+ifeq (browser,$(MOZ_BUILD_APP))
 DIRS = \
 	browser \
 	$(NULL)
+endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/content/tests/Makefile.in b/toolkit/content/tests/Makefile.in
index b7929dd34274..e8f1b7e56009 100644
--- a/toolkit/content/tests/Makefile.in
+++ b/toolkit/content/tests/Makefile.in
@@ -47,6 +47,10 @@ MODULE		= test_toolkit_general
 
 XPCSHELL_TESTS = unit
 
-DIRS = browser chrome widgets
+DIRS = chrome widgets
+
+ifeq (browser,$(MOZ_BUILD_APP))
+DIRS += browser
+endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/crashreporter/test/Makefile.in b/toolkit/crashreporter/test/Makefile.in
index 2947459ecbb4..ff6d063df50c 100644
--- a/toolkit/crashreporter/test/Makefile.in
+++ b/toolkit/crashreporter/test/Makefile.in
@@ -77,6 +77,7 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq (browser,$(MOZ_BUILD_APP))
 _BROWSER_FILES = \
   browser/aboutcrashes_utils.js \
   browser/crashreport.sjs \
@@ -90,3 +91,10 @@ libs::  $(_BROWSER_FILES)
 	$(NSINSTALL) -D $(DEPTH)/_tests/xpcshell/$(MODULE)/unit/components
 	$(INSTALL) $(SHARED_LIBRARY) \
           $(DEPTH)/_tests/xpcshell/$(MODULE)/unit/components
+else
+
+libs::
+	$(NSINSTALL) -D $(DEPTH)/_tests/xpcshell/$(MODULE)/unit/components
+	$(INSTALL) $(SHARED_LIBRARY) \
+          $(DEPTH)/_tests/xpcshell/$(MODULE)/unit/components
+endif
diff --git a/toolkit/mozapps/extensions/test/Makefile.in b/toolkit/mozapps/extensions/test/Makefile.in
index 3dacb54b2aad..d3bff0c7c5d0 100644
--- a/toolkit/mozapps/extensions/test/Makefile.in
+++ b/toolkit/mozapps/extensions/test/Makefile.in
@@ -53,6 +53,11 @@ DIRS = \
   xpinstall \
   $(NULL)
 
+ifeq (browser,$(MOZ_BUILD_APP))
+ DIRS += browser
+endif
+
+
 XPCSHELL_TESTS = \
   xpcshell \
   $(NULL)
diff --git a/toolkit/mozapps/plugins/tests/Makefile.in b/toolkit/mozapps/plugins/tests/Makefile.in
index f773c9477d93..d8172e96bcd0 100644
--- a/toolkit/mozapps/plugins/tests/Makefile.in
+++ b/toolkit/mozapps/plugins/tests/Makefile.in
@@ -47,6 +47,7 @@ relativesrcdir  = toolkit/mozapps/plugins/tests
 TESTROOT = $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
 USE_STATIC_LIBS = 1
 
+ifeq (browser,$(MOZ_BUILD_APP))
 _BROWSER_FILES = \
   browser_bug435788.js \
   pfs_bug435788_1.rdf \
@@ -54,6 +55,7 @@ _BROWSER_FILES = \
   GoodExtension.xpi \
   BadExtension.xpi \
   $(NULL)
+endif
 
 CPPSRCS = \
   GoodPlugin.cpp \
@@ -73,7 +75,9 @@ $(TESTROOT):
 $(PROGRAMS): $(TESTROOT)/% : %$(BIN_SUFFIX)
 	cp $< $@
 
+ifeq (browser,$(MOZ_BUILD_APP))
 libs::
 	$(INSTALL) $(foreach f,$(_BROWSER_FILES),"$(srcdir)/$f") $(TESTROOT)
 
 libs:: $(PROGRAMS)
+endif
diff --git a/xpinstall/tests/Makefile.in b/xpinstall/tests/Makefile.in
index 500b157aa5cb..04996ba3c2e3 100644
--- a/xpinstall/tests/Makefile.in
+++ b/xpinstall/tests/Makefile.in
@@ -43,6 +43,7 @@ relativesrcdir  = xpinstall/tests
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
+ifeq (browser,$(MOZ_BUILD_APP))
 _BROWSER_FILES = harness.js \
                  browser_unsigned_url.js \
                  browser_unsigned_trigger.js \
@@ -104,3 +105,4 @@ _BROWSER_FILES = harness.js \
 
 libs::	$(_BROWSER_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+endif