diff --git a/Makefile.am b/Makefile.am
index dae7f7b64..1b3f63150 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -425,6 +425,8 @@ clean-local:
 	-rm -rf tmp/libguestfs??????
 	-rm -rf tmp/guestfs.*
 	-rm -rf tmp/.guestfs-*
+	-rm -rf tmp/null.*
+	-find tmp -type s -delete
 
 # 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