diff --git a/Makefile.am b/Makefile.am
index 9109ae64b..123045f7c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -304,12 +304,14 @@ CLEANFILES = \
 	podwrapper.1 \
 	qemu-wrapper.sh \
 	stamp-guestfs-release-notes.pod \
-	tmp/guestfs.* \
+	tmp/disk* \
 	tmp/run-* \
 	tmp/valgrind-*.log
 
 clean-local:
 	-rm -rf tmp/libguestfs??????
+	-rm -rf tmp/guestfs.*
+	-rm -rf tmp/.guestfs-*
 
 # If you don't want to run all of the tests ('make check') then this
 # will just run libguestfs-test-tool for a quick check.  Note this