--- a/Makefile.in
+++ b/Makefile.in
@@ -36,17 +36,17 @@
 
 DEPTH		= .
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(topsrcdir)/config/config.mk
 
-default install export libs clean realclean distclean alldep maybe_clobber_profiledbuild check rebase splitsymbols uploadsymbols signnss deliver::
+default install export libs clean realclean distclean alldep maybe_clobber_profiledbuild check rebase splitsymbols uploadsymbols signnss deliver mochitest mochitest-plain mochitest-chrome mochitest-browser-chrome mochitest-a11y::
 	$(MAKE) -C mozilla $@
 
 # http://bugzilla.mozilla.org/show_bug.cgi?id=450485
 buildsymbols ::
 	$(MAKE) -C mozilla $@ MAKE_SYM_STORE_PATH=..
 
 include $(topsrcdir)/$(MOZ_BUILD_APP)/build.mk
 

--- a/suite/build.mk
+++ b/suite/build.mk
@@ -81,8 +81,22 @@ endif # COMM_BUILD
 installer:
 	@$(MAKE) -C suite/installer installer
 
 package:
 	@$(MAKE) -C suite/installer
 
 install::
 	@$(MAKE) -C suite/installer install
+
+ifndef COMM_BUILD
+# mochitests need to be run from the Mozilla build system
+ifdef ENABLE_TESTS
+# Implemented in testing/testsuite-targets.mk
+mochitest-browser-chrome:
+	$(RUN_MOCHITEST) --browser-chrome
+	$(CHECK_TEST_ERROR)
+
+mochitest:: mochitest-browser-chrome
+
+.PHONY: mochitest-browser-chrome
+endif
+endif