diff --git a/Makefile b/Makefile
index ecbd9d4d1f..4c49bd4929 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ clean:
 # avoid old build problems by removing potentially incorrect old files
 	rm -f config.mak config.h op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h 
 	rm -f *.o *.a $(TOOLS) dyngen TAGS qemu.pod
+	make -C tests clean
 	for d in $(TARGET_DIRS); do \
 	make -C $$d $@ || exit 1 ; \
         done
diff --git a/tests/Makefile b/tests/Makefile
index a9bb0f3dc5..c224504307 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -72,4 +72,4 @@ test2:
         done
 
 clean:
-	rm -f *~ *.o $(TESTS)
+	rm -f *~ *.o test-i386.out test-i386.ref $(TESTS)