diff --git a/Make.rules.in b/Make.rules.in
index 0eb61c7fbb6..4ca02141ecb 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -141,7 +141,7 @@ LINTS = $(C_SRCS:.c=.ln)
 .pl.ok:
 	$(RUNTEST) $(RUNTESTFLAGS) $< && touch $@
 
-.PHONY: all install uninstall clean distclean depend dummy test testclean
+.PHONY: all install uninstall clean distclean depend dummy check test testclean
 
 # 'all' target first in case the enclosing Makefile didn't define any target
 
@@ -242,7 +242,7 @@ testclean:: $(SUBDIRS:%=%/__testclean__)
 	$(RM) $(TESTRESULTS)
 
 clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__)
-	$(RM) $(CLEAN_FILES) $(GEN_C_SRCS) $(GEN_ASM_SRCS) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) $(MC_SRCS:.mc=.mc.rc) $(TESTRESULTS) $(PROGRAMS)
+	$(RM) $(CLEAN_FILES) $(GEN_C_SRCS) $(GEN_ASM_SRCS) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) $(MC_SRCS:.mc=.mc.rc) $(TESTRESULTS) $(TESTLIST) $(PROGRAMS)
 
 # Rules for installing
 
@@ -254,7 +254,7 @@ $(SUBDIRS:%=%/__uninstall__): dummy
 
 # Rules for testing
 
-test:: $(TESTRESULTS)
+check test:: $(TESTRESULTS)
 
 $(PLTESTS:.c=.ok): $(WINETEST)
 $(CTESTS:.c=.ok): $(TESTPROGRAM).so
diff --git a/Makefile.in b/Makefile.in
index b92afde5bf6..e357cc21673 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -134,7 +134,7 @@ checklink::
 	@cd dlls && $(MAKE) checklink
 	@cd debugger && $(MAKE) checklink
 
-test::
+check test::
 	@cd programs/winetest && $(MAKE) test
 	@cd dlls && $(MAKE) test
 
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index b2a3d2aad95..6901d5277d8 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -794,7 +794,7 @@ install:: $(SUBDIRS:%=%/__install__)
 
 uninstall:: $(SUBDIRS:%=%/__uninstall__)
 
-test:: $(SUBDIRS:%=%/__test__)
+check test:: $(SUBDIRS:%=%/__test__)
 
 checklink:: $(SUBDIRS:%=%/__checklink__)
 
diff --git a/dlls/make_dlls b/dlls/make_dlls
index 7a51bb0d96f..c5e8f44ec62 100755
--- a/dlls/make_dlls
+++ b/dlls/make_dlls
@@ -211,7 +211,7 @@ install:: \$(SUBDIRS:%=%/__install__)
 
 uninstall:: \$(SUBDIRS:%=%/__uninstall__)
 
-test:: \$(SUBDIRS:%=%/__test__)
+check test:: \$(SUBDIRS:%=%/__test__)
 
 checklink:: \$(SUBDIRS:%=%/__checklink__)