diff --git a/docshell/test/Makefile.in b/docshell/test/Makefile.in
index 1be74463b696..5cb2966f7a73 100644
--- a/docshell/test/Makefile.in
+++ b/docshell/test/Makefile.in
@@ -47,13 +47,14 @@ DIRS += chrome \
 	navigation \
 	$(NULL)
 
-ifeq (browser,$(MOZ_BUILD_APP))
-	DIRS += browser
-endif
-
 XPCSHELL_TESTS = unit
 
 include $(DEPTH)/config/autoconf.mk
+
+ifneq (mobile,$(MOZ_BUILD_APP))
+	DIRS += browser
+endif
+
 include $(topsrcdir)/config/rules.mk
 
 _TEST_FILES = \
diff --git a/dom/tests/Makefile.in b/dom/tests/Makefile.in
index 690dabc95870..9871675a0fe7 100644
--- a/dom/tests/Makefile.in
+++ b/dom/tests/Makefile.in
@@ -48,7 +48,7 @@ DIRS		+= mochitest \
 		$(NULL)
 XPCSHELL_TESTS = unit
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 	dirs += browser
 endif
 
diff --git a/layout/style/test/Makefile.in b/layout/style/test/Makefile.in
index d09d55ae2529..e435247a9d5a 100644
--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -219,7 +219,7 @@ _VISITED_REFTEST_FILES = \
 		$(topsrcdir)/layout/reftests/svg/pseudo-classes-02-ref.svg \
 		$(NULL)
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 _BROWSER_FILES = \
 		browser_bug453896.js \
 		bug453896_iframe.html \
@@ -233,7 +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))
+ifneq (mobile,$(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 376c9624b980..5c10616c6eb7 100644
--- a/toolkit/components/downloads/test/Makefile.in
+++ b/toolkit/components/downloads/test/Makefile.in
@@ -50,7 +50,7 @@ XPCSHELL_TESTS = \
   schema_migration \
   $(NULL)
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 DIRS = \
   browser \
   $(NULL)
diff --git a/toolkit/components/passwordmgr/test/Makefile.in b/toolkit/components/passwordmgr/test/Makefile.in
index 2a7e597ba449..7068b219c22c 100644
--- a/toolkit/components/passwordmgr/test/Makefile.in
+++ b/toolkit/components/passwordmgr/test/Makefile.in
@@ -43,7 +43,7 @@ relativesrcdir  = toolkit/components/passwordmgr/test
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 DIRS = \
 	browser \
 	$(NULL)
diff --git a/toolkit/components/places/tests/Makefile.in b/toolkit/components/places/tests/Makefile.in
index 179adfee60bb..c6b6c13492b9 100644
--- a/toolkit/components/places/tests/Makefile.in
+++ b/toolkit/components/places/tests/Makefile.in
@@ -73,7 +73,7 @@ DIRS = \
 	mochitest/bug_461710 \
 	$(NULL)
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 	DIRS += browser
 endif
 
diff --git a/toolkit/components/startup/tests/Makefile.in b/toolkit/components/startup/tests/Makefile.in
index 8cdfa37375d1..7593b23d8c9d 100644
--- a/toolkit/components/startup/tests/Makefile.in
+++ b/toolkit/components/startup/tests/Makefile.in
@@ -42,7 +42,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 DIRS = \
 	browser \
 	$(NULL)
diff --git a/toolkit/content/tests/Makefile.in b/toolkit/content/tests/Makefile.in
index e8f1b7e56009..88c279002c4f 100644
--- a/toolkit/content/tests/Makefile.in
+++ b/toolkit/content/tests/Makefile.in
@@ -49,7 +49,7 @@ XPCSHELL_TESTS = unit
 
 DIRS = chrome widgets
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 DIRS += browser
 endif
 
diff --git a/toolkit/crashreporter/test/Makefile.in b/toolkit/crashreporter/test/Makefile.in
index ff6d063df50c..a689c5177386 100644
--- a/toolkit/crashreporter/test/Makefile.in
+++ b/toolkit/crashreporter/test/Makefile.in
@@ -77,7 +77,7 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 _BROWSER_FILES = \
   browser/aboutcrashes_utils.js \
   browser/crashreport.sjs \
diff --git a/toolkit/mozapps/extensions/test/Makefile.in b/toolkit/mozapps/extensions/test/Makefile.in
index 533b3e44307d..6e83c7af3777 100644
--- a/toolkit/mozapps/extensions/test/Makefile.in
+++ b/toolkit/mozapps/extensions/test/Makefile.in
@@ -52,7 +52,7 @@ DIRS = \
   xpinstall \
   $(NULL)
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
  DIRS += browser
 endif
 
diff --git a/toolkit/mozapps/plugins/tests/Makefile.in b/toolkit/mozapps/plugins/tests/Makefile.in
index d8172e96bcd0..9c333f248693 100644
--- a/toolkit/mozapps/plugins/tests/Makefile.in
+++ b/toolkit/mozapps/plugins/tests/Makefile.in
@@ -47,7 +47,7 @@ relativesrcdir  = toolkit/mozapps/plugins/tests
 TESTROOT = $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
 USE_STATIC_LIBS = 1
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 _BROWSER_FILES = \
   browser_bug435788.js \
   pfs_bug435788_1.rdf \
@@ -75,7 +75,7 @@ $(TESTROOT):
 $(PROGRAMS): $(TESTROOT)/% : %$(BIN_SUFFIX)
 	cp $< $@
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 libs::
 	$(INSTALL) $(foreach f,$(_BROWSER_FILES),"$(srcdir)/$f") $(TESTROOT)
 
diff --git a/xpinstall/tests/Makefile.in b/xpinstall/tests/Makefile.in
index 04996ba3c2e3..3412f19ee3ac 100644
--- a/xpinstall/tests/Makefile.in
+++ b/xpinstall/tests/Makefile.in
@@ -43,7 +43,7 @@ relativesrcdir  = xpinstall/tests
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 _BROWSER_FILES = harness.js \
                  browser_unsigned_url.js \
                  browser_unsigned_trigger.js \