--- a/Makefile.in
+++ b/Makefile.in
@@ -71,20 +71,20 @@ config.status: $(topsrcdir)/configure
 	@echo "Please rerun configure."
 	@echo "To ignore this message, touch 'config.status' in the build directory."
 	@exit 1
 
 default export libs clean realclean distclean alldep maybe_clobber_profiledbuild uploadsymbols all::
 	$(MAKE) -C mozilla $@
 
 ifdef ENABLE_TESTS
-check mochitest reftest crashtest xpcshell-tests::
-	$(MAKE) -C mozilla $@
-
-mochitest-% ::
+check \
+mochitest mochitest-plain mochitest-chrome mochitest-browser-chrome mochitest-a11y \
+reftest crashtest \
+xpcshell-tests::
 	$(MAKE) -C mozilla $@
 endif
 
 ifndef MOZ_THUNDERBIRD
 package-tests::
 	$(MAKE) -C mozilla $@
 endif
 

--- a/mailnews/Makefile.in
+++ b/mailnews/Makefile.in
@@ -91,17 +91,17 @@ libs::
 	$(INSTALL) $(wildcard $(srcdir)/test/fakeserver/*.js) $(MOZDEPTH)/_tests/xpcshell/mailnews/fakeserver
 
 # We provide an xpcshell-tests target here because the top-level target acts
 # differently to the specific directory one. We want our developers to be able
 # to run "make -C mailnews xpcshell-tests" so we do this short-cut here. This
 # list is kept in the same order as the effective DIRS just so things turn up
 # in the same order as the build.
 
-TEST_DIRS = base $(PARALLEL_DIRS) extensions/bayesian-spam-filter extensions/mdn
+TEST_DIRS = base $(PARALLEL_DIRS) extensions/bayesian-spam-filter
 
 xpcshell-tests::
 	for dir in $(TEST_DIRS); do \
 	  if test -d $$dir/test; then \
 	    $(MAKE) -C $$dir/test xpcshell-tests; \
 	  fi; \
 	done
 endif