diff --git a/Make.rules.in b/Make.rules.in
index 5fb5d79b27d..33365bc6823 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -259,6 +259,9 @@ $(SUBDIRS:%=%/__uninstall__): dummy
 
 check test:: $(TESTRESULTS)
 
+$(SUBDIRS:%=%/__test__): dummy
+	@cd `dirname $@` && $(MAKE) test
+
 $(PLTESTS:.c=.ok): $(WINETEST)
 $(CTESTS:.c=.ok): $(TESTPROGRAM).so
 
diff --git a/Makefile.in b/Makefile.in
index 9b0d7b436b4..f2001e1859c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -71,6 +71,11 @@ INSTALLSUBDIRS = \
 	tsx11 \
 	unicode
 
+# Sub-directories to run make test into
+TESTSUBDIRS = \
+	programs/winetest \
+	dlls
+
 EMUOBJS = \
 	miscemu/miscemu.o
 
@@ -157,9 +162,12 @@ checklink::
 	@cd dlls && $(MAKE) checklink
 	@cd debugger && $(MAKE) checklink
 
-check test::
-	@cd programs/winetest && $(MAKE) test
-	@cd dlls && $(MAKE) test
+test_environment: dummy
+	@cd programs/winetest && $(MAKE) all
+
+$(TESTSUBDIRS:%=%/__test__): test_environment
+
+check test:: $(TESTSUBDIRS:%=%/__test__)
 
 TAGS etags:
 	etags `find $(TOPSRCDIR) -name '*.[chS]' -print | grep -v dbgmain`
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 536f17e5815..f44b2646de0 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -840,9 +840,6 @@ libkernel32.dll.$(LIBEXT): kernel/kernel32.dll$(DLLEXT)
 
 # Misc rules
 
-$(SUBDIRS:%=%/__test__): dummy
-	@cd `dirname $@` && $(MAKE) test
-
 $(SUBDIRS:%=%/__checklink__): dummy
 	@cd `dirname $@` && $(MAKE) checklink
 
diff --git a/dlls/make_dlls b/dlls/make_dlls
index 3788940ca7e..f08af42880a 100755
--- a/dlls/make_dlls
+++ b/dlls/make_dlls
@@ -246,9 +246,6 @@ foreach $mod (keys %linkable_dlls)
 print NEWMAKE <<EOF;
 # Misc rules
 
-\$(SUBDIRS:%=%/__test__): dummy
-	\@cd `dirname \$\@` && \$(MAKE) test
-
 \$(SUBDIRS:%=%/__checklink__): dummy
 	\@cd `dirname \$\@` && \$(MAKE) checklink
 
diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in
index caa72b93571..c8704c3768b 100644
--- a/dlls/oleaut32/Makefile.in
+++ b/dlls/oleaut32/Makefile.in
@@ -32,6 +32,8 @@ RC_SRCS = \
 
 CTESTS = tests/vartest.c
 
+EXTRASUBDIRS = tests
+
 @MAKE_DLL_RULES@
 
 ### Dependencies:
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in
index 2fcb546a1ab..6b031e28705 100644
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@@ -10,6 +10,8 @@ MODULE    = winetest
 
 C_SRCS = winetest.c
 
+EXTRA_SRCS = wtmain.c
+
 EXTRA_OBJS = wine.o
 
 EXTRASUBDIRS = include tests
@@ -19,6 +21,8 @@ PLTESTS = \
 
 @MAKE_PROG_RULES@
 
+all: wtmain.o
+
 wine.c: wine.xs
 	perl $(XSUBPPDIR)/xsubpp -typemap $(XSUBPPDIR)/typemap $(SRCDIR)/wine.xs >wine.c || $(RM) wine.c