diff --git a/tests/Mmake.common b/tests/Mmake.common
index 4962cee84..af0ca110d 100644
--- a/tests/Mmake.common
+++ b/tests/Mmake.common
@@ -35,7 +35,7 @@ DIFF_OPTS=-c
 
 #-----------------------------------------------------------------------------#
 
-clean: clean_out clean_res
+clean_local: clean_out clean_res
 
 clean_mc: clean_c clean_o clean_out clean_res
 
diff --git a/tests/general/Mmakefile b/tests/general/Mmakefile
index c1c02821b..c0c83f19e 100644
--- a/tests/general/Mmakefile
+++ b/tests/general/Mmakefile
@@ -117,32 +117,32 @@ SUBDIRS = accumulator
 
 check_subdirs:
 	for dir in $(SUBDIRS); do \
-		(cd $$dir && $(SUBDIR_MMAKE) check_subdirs) || exit 1; \
+		(cd $$dir && $(SUBDIR_MMAKE) check) || exit 1; \
 	done
 
 dep_subdirs:
 	for dir in $(SUBDIRS); do \
-		(cd $$dir && $(SUBDIR_MMAKE) dep_subdirs) || exit 1; \
+		(cd $$dir && $(SUBDIR_MMAKE) dep) || exit 1; \
 	done
 
 depend_subdirs:
 	for dir in $(SUBDIRS); do \
-		(cd $$dir && $(SUBDIR_MMAKE) depend_subdirs) || exit 1; \
+		(cd $$dir && $(SUBDIR_MMAKE) depend) || exit 1; \
 	done
 
 realclean_subdirs:
 	for dir in $(SUBDIRS); do \
-		(cd $$dir && $(SUBDIR_MMAKE) realclean_subdirs) || exit 1; \
+		(cd $$dir && $(SUBDIR_MMAKE) realclean) || exit 1; \
 	done
 
 clean_subdirs:
 	for dir in $(SUBDIRS); do \
-		(cd $$dir && $(SUBDIR_MMAKE) clean_subdirs) || exit 1; \
+		(cd $$dir && $(SUBDIR_MMAKE) clean) || exit 1; \
 	done
 
 all_subdirs:
 	for dir in $(SUBDIRS); do \
-		(cd $$dir && $(SUBDIR_MMAKE) all_subdirs) || exit 1; \
+		(cd $$dir && $(SUBDIR_MMAKE) all) || exit 1; \
 	done
 
 #-----------------------------------------------------------------------------#
diff --git a/tests/general/accumulator/Mmakefile b/tests/general/accumulator/Mmakefile
index d6a2c23f8..7165cd6ff 100644
--- a/tests/general/accumulator/Mmakefile
+++ b/tests/general/accumulator/Mmakefile
@@ -54,7 +54,7 @@ mods:	$(MODS)
 
 all:	$(PROGS)
 
-realclean: clean_hlds_dump
+realclean_local: clean_hlds_dump
 
 clean_hlds_dump:
 	-rm -f *hlds_dump*
diff --git a/tests/invalid/Mmakefile b/tests/invalid/Mmakefile
index 06276d7c3..0caaecca7 100644
--- a/tests/invalid/Mmakefile
+++ b/tests/invalid/Mmakefile
@@ -118,7 +118,7 @@ errs:	$(ERRS)
 depend:	aditi_update_errors.depend aditi_update_mode_errors.depend \
 		test_nested.depend partial_implied_mode.depend
 
-clean:
+clean_local:
 	rm -f *.err *.err_res
 
 #-----------------------------------------------------------------------------#
diff --git a/tests/misc_tests/Mmakefile b/tests/misc_tests/Mmakefile
index fd26ba9c2..67a40ba78 100644
--- a/tests/misc_tests/Mmakefile
+++ b/tests/misc_tests/Mmakefile
@@ -37,7 +37,7 @@ check:	$(OUTS) $(RESS)
 
 all:	$(PROGS)
 
-clean:	clean_ugly
+clean_local:	clean_ugly
 
 clean_ugly:
 	rm -fr *.ugly
diff --git a/tests/tabling/Mmakefile b/tests/tabling/Mmakefile
index 2a8d5f2e1..d9d2bc256 100644
--- a/tests/tabling/Mmakefile
+++ b/tests/tabling/Mmakefile
@@ -69,8 +69,8 @@ check:	$(OUTS) $(RESS)
 
 all:	$(PROGS)
 
-clean:
+clean_local:
 
-realclean:
+realclean_local:
 
 #-----------------------------------------------------------------------------#
diff --git a/tests/term/Mmakefile b/tests/term/Mmakefile
index 74a4b9771..f1bcf92f9 100644
--- a/tests/term/Mmakefile
+++ b/tests/term/Mmakefile
@@ -90,10 +90,10 @@ trans_opts: $(TRANS_OPTS)
 
 check: $(TRANS_OPT_RESS)
 
-clean:
+clean_local:
 	rm -f *.trans_opt_err
 
-realclean:
+realclean_local:
 	rm -f *.trans_opt_res
 
 #-----------------------------------------------------------------------------#
diff --git a/tests/valid/Mmakefile b/tests/valid/Mmakefile
index 8997f9a4f..98b480e2c 100644
--- a/tests/valid/Mmakefile
+++ b/tests/valid/Mmakefile
@@ -199,7 +199,7 @@ printtests:
 printobjs:
 	@echo $(OBJS)
 
-clean:
+clean_local:
 	rm -f *.err *.h
 
 #-----------------------------------------------------------------------------#
diff --git a/tests/warnings/Mmakefile b/tests/warnings/Mmakefile
index 8578f3caf..fec098702 100644
--- a/tests/warnings/Mmakefile
+++ b/tests/warnings/Mmakefile
@@ -45,7 +45,7 @@ check:	$(ERRS) $(RESS)
 
 all:	$(PROGS)
 
-clean:	clean_err clean_res
+clean_local:	clean_err clean_res
 
 clean_mc: clean_c clean_o clean_err clean_res