--- a/browser/build.mk
+++ b/browser/build.mk
@@ -57,16 +57,24 @@ installer:
 package:
 	@$(MAKE) -C browser/installer
 
 install::
 	@$(MAKE) -C browser/installer install
 
 ifdef ENABLE_TESTS
 # Implemented in testing/testsuite-targets.mk
+
+# Browser tests live in a slightly different location, so we correct the path
+ifdef TEST_PATH
+BROWSER_TEST_PATH = --test-path=../browser/$(TEST_PATH)
+else
+BROWSER_TEST_PATH =
+endif
+
 mochitest-browser-chrome:
-	$(RUN_MOCHITEST) --browser-chrome
+	$(RUN_MOCHITEST) --browser-chrome $(BROWSER_TEST_PATH)
 	$(CHECK_TEST_ERROR)
 
 mochitest:: mochitest-browser-chrome
 
 .PHONY: mochitest-browser-chrome
 endif

--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -47,21 +47,27 @@ define CHECK_TEST_ERROR
 	  echo "$$errors"; \
 	  exit 1; \
   else \
 	  echo "$@ passed"; \
   fi
 endef
 endif
 
+ifdef TEST_PATH
+MOCHITEST_PATH = --test-path=$(TEST_PATH)
+else
+MOCHITEST_PATH =
+endif
+
 mochitest-plain:
-	$(RUN_MOCHITEST)
+	$(RUN_MOCHITEST) $(MOCHITEST_PATH)
 	$(CHECK_TEST_ERROR)
 
 mochitest-chrome:
-	$(RUN_MOCHITEST) --chrome
+	$(RUN_MOCHITEST) --chrome $(MOCHITEST_PATH)
 	$(CHECK_TEST_ERROR)
 
 mochitest-a11y:
-	$(RUN_MOCHITEST) --a11y
+	$(RUN_MOCHITEST) --a11y $(MOCHITEST_PATH)
 	$(CHECK_TEST_ERROR)
 
 .PHONY: mochitest mochitest-plain mochitest-chrome mochitest-a11y