diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 3aab2fe2f69..f309326db23 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -61,7 +61,7 @@ endif
 # browser_bug321000.js is disabled because newline handling is shaky (bug 592528)
 # browser_bug386835.js is disabled for intermittent failures (bug 880226)
 
-_BROWSER_FILES = \
+MOCHITEST_BROWSER_FILES = \
                  head.js \
                  browser_typeAheadFind.js \
                  browser_keywordSearch.js \
@@ -340,36 +340,33 @@ _BROWSER_FILES = \
 
 # Disable tests on Windows due to frequent failures (bugs 825739, 841341)
 ifneq (windows,$(MOZ_WIDGET_TOOLKIT))
-_BROWSER_FILES += \
+MOCHITEST_BROWSER_FILES += \
                  browser_bookmark_titles.js \
                  browser_popupNotification.js \
                  $(NULL)
 endif
 
 ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-_BROWSER_FILES += \
+MOCHITEST_BROWSER_FILES += \
 		browser_bug462289.js \
 		$(NULL)
 else
-_BROWSER_FILES += \
+MOCHITEST_BROWSER_FILES += \
 		browser_bug565667.js \
 		$(NULL)
 endif
 
 ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 # Bug 766546.
-_BROWSER_FILES += \
+MOCHITEST_BROWSER_FILES += \
   browser_bug561636.js \
   $(NULL)
 endif
 
 ifdef MOZ_DATA_REPORTING
-_BROWSER_FILES += \
+MOCHITEST_BROWSER_FILES += \
   browser_datareporting_notification.js \
   $(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
-
-libs::	$(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
diff --git a/browser/base/content/test/newtab/Makefile.in b/browser/base/content/test/newtab/Makefile.in
index e7216012d2c..0a61302b694 100644
--- a/browser/base/content/test/newtab/Makefile.in
+++ b/browser/base/content/test/newtab/Makefile.in
@@ -9,9 +9,8 @@ VPATH		= @srcdir@
 relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
 
-_BROWSER_FILES = \
+MOCHITEST_BROWSER_FILES = \
 	browser_newtab_block.js \
 	browser_newtab_disable.js \
 	browser_newtab_drag_drop.js \
@@ -35,5 +34,4 @@ _BROWSER_FILES = \
 	head.js \
 	$(NULL)
 
-libs::	$(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+include $(topsrcdir)/config/rules.mk
diff --git a/browser/base/content/test/social/Makefile.in b/browser/base/content/test/social/Makefile.in
index 3d9ddcfd4c3..ff334cc6175 100644
--- a/browser/base/content/test/social/Makefile.in
+++ b/browser/base/content/test/social/Makefile.in
@@ -10,7 +10,7 @@ relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-_BROWSER_FILES = \
+MOCHITEST_BROWSER_FILES = \
                  head.js \
 		 blocklist.xml \
 		 blocklistEmpty.xml \
@@ -45,6 +45,3 @@ _BROWSER_FILES = \
                  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
-
-libs::	$(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
diff --git a/browser/base/content/test/social/opengraph/Makefile.in b/browser/base/content/test/social/opengraph/Makefile.in
index 4a182fa91b3..d0d5a189083 100644
--- a/browser/base/content/test/social/opengraph/Makefile.in
+++ b/browser/base/content/test/social/opengraph/Makefile.in
@@ -10,7 +10,7 @@ relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-_BROWSER_FILES = \
+MOCHITEST_BROWSER_FILES := \
                  opengraph.html \
                  og_invalid_url.html \
                  shortlink_linkrel.html \
@@ -19,6 +19,3 @@ _BROWSER_FILES = \
                  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
-
-libs::	$(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
diff --git a/browser/components/certerror/test/Makefile.in b/browser/components/certerror/test/Makefile.in
index 5ec95b35051..6037dae127d 100644
--- a/browser/components/certerror/test/Makefile.in
+++ b/browser/components/certerror/test/Makefile.in
@@ -10,12 +10,10 @@ VPATH		= @srcdir@
 relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
+
+MOCHITEST_BROWSER_FILES := \
+  browser_bug431826.js \
+  browser_bug633691.js \
+  $(NULL)
+
 include $(topsrcdir)/config/rules.mk
-
-_BROWSER_FILES = browser_bug431826.js \
-                 browser_bug633691.js \
-    $(NULL)
-
-libs::	$(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
-
diff --git a/browser/components/preferences/in-content/tests/Makefile.in b/browser/components/preferences/in-content/tests/Makefile.in
index 6d185c7ed94..9fe7713655d 100644
--- a/browser/components/preferences/in-content/tests/Makefile.in
+++ b/browser/components/preferences/in-content/tests/Makefile.in
@@ -9,9 +9,8 @@ VPATH		= @srcdir@
 relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
 
-_BROWSER_FILES = \
+MOCHITEST_BROWSER_FILES := \
     head.js \
     browser_advanced_update.js \
     browser_bug410900.js \
@@ -26,8 +25,9 @@ _BROWSER_FILES = \
     $(NULL)
 
 ifdef MOZ_SERVICES_HEALTHREPORT
-_BROWSER_FILES += browser_healthreport.js
+MOCHITEST_BROWSER_FILES += \
+  browser_healthreport.js \
+  $(NULL)
 endif
 
-libs::	$(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/preferences/tests/Makefile.in b/browser/components/preferences/tests/Makefile.in
index 17de1a5a7a8..cffc88f0b5e 100644
--- a/browser/components/preferences/tests/Makefile.in
+++ b/browser/components/preferences/tests/Makefile.in
@@ -9,9 +9,8 @@ VPATH		= @srcdir@
 relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
 
-_BROWSER_FILES = \
+MOCHITEST_BROWSER_FILES := \
     head.js \
     browser_advanced_update.js \
     browser_bug410900.js \
@@ -27,8 +26,7 @@ _BROWSER_FILES = \
     $(NULL)
 
 ifdef MOZ_SERVICES_HEALTHREPORT
-_BROWSER_FILES += browser_healthreport.js
+MOCHITEST_BROWSER_FILES += browser_healthreport.js
 endif
 
-libs::	$(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/safebrowsing/content/test/Makefile.in b/browser/components/safebrowsing/content/test/Makefile.in
index da4c8927c3b..1ca03dbe023 100644
--- a/browser/components/safebrowsing/content/test/Makefile.in
+++ b/browser/components/safebrowsing/content/test/Makefile.in
@@ -10,19 +10,18 @@ VPATH		= @srcdir@
 relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
+
+MOCHITEST_BROWSER_FILES := \
+  head.js \
+  browser_bug400731.js \
+  $(NULL)
 
 # The browser chrome test for bug 415846 doesn't run on Mac because of its
 # bizarre special-and-unique snowflake of a help menu.
 ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-_NON_MAC_BROWSER_TESTS = browser_bug415846.js
+MOCHITEST_BROWSER_FILES += \
+  browser_bug415846.js \
+  $(NULL)
 endif
 
-_BROWSER_FILES = head.js \
-                 browser_bug400731.js \
-                 $(_NON_MAC_BROWSER_TESTS) \
-    $(NULL)
-
-libs::	$(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
-
+include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/tabview/test/Makefile.in b/browser/components/tabview/test/Makefile.in
index 6eeaae4162e..6f9576ea079 100644
--- a/browser/components/tabview/test/Makefile.in
+++ b/browser/components/tabview/test/Makefile.in
@@ -9,9 +9,8 @@ VPATH		= @srcdir@
 relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
 
-_BROWSER_FILES = \
+MOCHITEST_BROWSER_FILES := \
                  browser_tabview_alltabs.js \
                  browser_tabview_apptabs.js \
                  browser_tabview_bug580412.js \
@@ -169,5 +168,4 @@ _BROWSER_FILES = \
 # browser_tabview_bug673729.js disabled for intermittent failures (bug 749980)
 # browser_tabview_bug696602.js disabled for intermittent failures (bug 736425)
 
-libs::	$(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/fontinspector/test/Makefile.in b/browser/devtools/fontinspector/test/Makefile.in
index 5ec06b98798..4e1e4577551 100644
--- a/browser/devtools/fontinspector/test/Makefile.in
+++ b/browser/devtools/fontinspector/test/Makefile.in
@@ -9,14 +9,11 @@ VPATH		= @srcdir@
 relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
 
-_BROWSER_FILES = \
+MOCHITEST_BROWSER_FILES := \
 		browser_fontinspector.js \
 		browser_fontinspector.html \
 		browser_font.woff \
 		$(NULL)
 
-
-libs::	$(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/inspector/test/Makefile.in b/browser/devtools/inspector/test/Makefile.in
index 27979ab345e..fd8333f8087 100644
--- a/browser/devtools/inspector/test/Makefile.in
+++ b/browser/devtools/inspector/test/Makefile.in
@@ -9,9 +9,8 @@ VPATH		= @srcdir@
 relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
 
-_BROWSER_FILES = \
+MOCHITEST_BROWSER_FILES := \
 		browser_inspector_iframeTest.js \
 		browser_inspector_initialization.js \
 		browser_inspector_highlighter.js \
@@ -47,5 +46,4 @@ _BROWSER_FILES = \
 		head.js \
 		$(NULL)
 
-libs::	$(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/layoutview/test/Makefile.in b/browser/devtools/layoutview/test/Makefile.in
index c26ccd03610..34a62289bf1 100644
--- a/browser/devtools/layoutview/test/Makefile.in
+++ b/browser/devtools/layoutview/test/Makefile.in
@@ -9,12 +9,9 @@ VPATH		= @srcdir@
 relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
 
-_BROWSER_FILES = \
+MOCHITEST_BROWSER_FILES := \
 		browser_layoutview.js \
 		$(NULL)
 
-
-libs::	$(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/markupview/test/Makefile.in b/browser/devtools/markupview/test/Makefile.in
index 8b0f0d399fa..2c0218d8028 100644
--- a/browser/devtools/markupview/test/Makefile.in
+++ b/browser/devtools/markupview/test/Makefile.in
@@ -9,9 +9,8 @@ VPATH		= @srcdir@
 relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
 
-_BROWSER_FILES = \
+MOCHITEST_BROWSER_FILES := \
 		browser_inspector_markup_navigation.html \
 		browser_inspector_markup_navigation.js \
 		browser_inspector_markup_mutation.html \
@@ -23,5 +22,4 @@ _BROWSER_FILES = \
 		head.js \
 		$(NULL)
 
-libs::	$(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/responsivedesign/test/Makefile.in b/browser/devtools/responsivedesign/test/Makefile.in
index 0b46be6c24e..a01d9dba9f9 100644
--- a/browser/devtools/responsivedesign/test/Makefile.in
+++ b/browser/devtools/responsivedesign/test/Makefile.in
@@ -1,39 +1,6 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Mozilla Foundation.
-# Portions created by the Initial Developer are Copyright (C) 2012
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Paul Rouget <paul@mozilla.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# 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/.
 
 DEPTH     = @DEPTH@
 topsrcdir	= @top_srcdir@
@@ -42,9 +9,8 @@ VPATH		= @srcdir@
 relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
 
-_BROWSER_FILES = \
+MOCHITEST_BROWSER_FILES := \
 		browser_responsiveui.js \
 		browser_responsiveuiaddcustompreset.js \
 		browser_responsiveruleview.js \
@@ -53,5 +19,4 @@ _BROWSER_FILES = \
 		head.js \
 		$(NULL)
 
-libs::	$(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/styleeditor/test/Makefile.in b/browser/devtools/styleeditor/test/Makefile.in
index c43c941e640..519ce166c17 100644
--- a/browser/devtools/styleeditor/test/Makefile.in
+++ b/browser/devtools/styleeditor/test/Makefile.in
@@ -9,9 +9,8 @@ VPATH		= @srcdir@
 relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
 
-_BROWSER_TEST_FILES = \
+MOCHITEST_BROWSER_FILES := \
                  browser_styleeditor_enabled.js \
                  browser_styleeditor_filesave.js \
                  browser_styleeditor_cmd_edit.js \
@@ -52,5 +51,4 @@ _BROWSER_TEST_FILES = \
                  test_private.css \
                  $(NULL)
 
-libs::	$(_BROWSER_TEST_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+include $(topsrcdir)/config/rules.mk
diff --git a/browser/fuel/test/Makefile.in b/browser/fuel/test/Makefile.in
index f8663ac7a64..79e82030d88 100644
--- a/browser/fuel/test/Makefile.in
+++ b/browser/fuel/test/Makefile.in
@@ -9,18 +9,17 @@ VPATH          = @srcdir@
 relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
+
+MOCHITEST_BROWSER_FILES := \
+  browser_Application.js \
+  browser_ApplicationPrefs.js \
+  browser_ApplicationStorage.js \
+  browser_ApplicationQuitting.js \
+  browser_Bookmarks.js \
+  browser_Browser.js \
+  ContentA.html \
+  ContentB.html \
+  ContentWithFrames.html \
+  $(NULL)
+
 include $(topsrcdir)/config/rules.mk
-
-_BROWSER_FILES =browser_Application.js \
-		browser_ApplicationPrefs.js \
-		browser_ApplicationStorage.js \
-		browser_ApplicationQuitting.js \
-		browser_Bookmarks.js \
-		browser_Browser.js \
-		ContentA.html \
-		ContentB.html \
-		ContentWithFrames.html \
-		$(NULL)
-
-libs::	$(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
diff --git a/browser/modules/test/Makefile.in b/browser/modules/test/Makefile.in
index d2971b133c1..00066aaee2d 100644
--- a/browser/modules/test/Makefile.in
+++ b/browser/modules/test/Makefile.in
@@ -10,19 +10,17 @@ relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/rules.mk
-
-_BROWSER_FILES = \
-                 browser_NetworkPrioritizer.js \
-                 # bug 793906 - temporarily disabling desktop UI while working on b2g
-                 # browser_SignInToWebsite.js \
-                 $(NULL)
+MOCHITEST_BROWSER_FILES := \
+  browser_NetworkPrioritizer.js \
+  $(NULL)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-_BROWSER_FILES += \
-                 browser_taskbar_preview.js \
-                 $(NULL)
+MOCHITEST_BROWSER_FILES += \
+  browser_taskbar_preview.js \
+  $(NULL)
 endif
 
-libs::	$(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+# bug 793906 - temporarily disabling desktop UI while working on b2g
+# browser_SignInToWebsite.js
+
+include $(topsrcdir)/config/rules.mk
diff --git a/js/xpconnect/tests/browser/Makefile.in b/js/xpconnect/tests/browser/Makefile.in
index 1eb39f8b5d1..1f8518ac125 100644
--- a/js/xpconnect/tests/browser/Makefile.in
+++ b/js/xpconnect/tests/browser/Makefile.in
@@ -1,4 +1,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/.
@@ -10,11 +9,9 @@ VPATH = @srcdir@
 relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
 
-_BROWSER_FILES = \
+MOCHITEST_BROWSER_FILES := \
 		browser_dead_object.js \
 		$(NULL)
 
-libs::	$(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/thumbnails/test/Makefile.in b/toolkit/components/thumbnails/test/Makefile.in
index 0ec29cb8ac9..451fdc51fc6 100644
--- a/toolkit/components/thumbnails/test/Makefile.in
+++ b/toolkit/components/thumbnails/test/Makefile.in
@@ -9,9 +9,8 @@ VPATH		= @srcdir@
 relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
 
-_BROWSER_FILES = \
+MOCHITEST_BROWSER_FILES := \
 	browser_thumbnails_background.js \
 	browser_thumbnails_capture.js \
 	browser_thumbnails_expiration.js \
@@ -29,5 +28,4 @@ _BROWSER_FILES = \
 	thumbnails_background.sjs \
 	$(NULL)
 
-libs::	$(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/mozapps/plugins/tests/Makefile.in b/toolkit/mozapps/plugins/tests/Makefile.in
index d282215bc38..254fda6e782 100644
--- a/toolkit/mozapps/plugins/tests/Makefile.in
+++ b/toolkit/mozapps/plugins/tests/Makefile.in
@@ -13,7 +13,7 @@ relativesrcdir  = @relativesrcdir@
 TESTROOT = $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
 USE_STATIC_LIBS = 1
 
-_BROWSER_FILES = \
+MOCHITEST_BROWSER_FILES = \
   $(filter disabled-for-leaks--bug-751100, browser_bug435788.js) \
   pfs_bug435788_1.rdf \
   pfs_bug435788_2.rdf \
@@ -27,14 +27,11 @@ PROGRAMS = $(SIMPLE_PROGRAMS:%$(BIN_SUFFIX)=$(TESTROOT)/%)
 
 include $(topsrcdir)/config/rules.mk
 
-$(PROGRAMS) $(_BROWSER_FILES): $(TESTROOT)
+$(PROGRAMS): $(TESTROOT)
 $(TESTROOT):
 	$(NSINSTALL) -D $@
 
 $(PROGRAMS): $(TESTROOT)/% : %$(BIN_SUFFIX)
 	cp $< $@
 
-libs::
-	$(INSTALL) $(foreach f,$(_BROWSER_FILES),"$(srcdir)/$f") $(TESTROOT)
-
 libs:: $(PROGRAMS)