diff --git a/Makefile b/Makefile
index 01f6a2112..a35d9a2d3 100644
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,8 @@ install_flat: instlist
 	@for i in `./instlist`; do ln -s toybox "$(PREFIX)/$$i"; done
 
 clean::
-	rm -f toybox toybox_unstripped generated/config.h generated/Config.in \
-		generated/newtoys.h generated/globals.h instlist
+	rm -rf toybox toybox_unstripped generated/config.h generated/Config.in \
+		generated/newtoys.h generated/globals.h instlist testdir
 
 distclean: clean
 	rm -f toybox_old .config* generated/help.h
diff --git a/test.sh b/test.sh
index 818e8ad06..1833682f6 100755
--- a/test.sh
+++ b/test.sh
@@ -28,6 +28,3 @@ else
     . $i
   done
 fi
-
-cd ..
-rm -rf testdir