diff --git a/Makefile b/Makefile
index 6005fa592bd9..3d4952f6867f 100644
--- a/Makefile
+++ b/Makefile
@@ -68,6 +68,7 @@ nofuse: deps
 
 clean:
 	$(MAKE) -C cmd/ipfs clean
+	$(MAKE) -C test clean
 
 uninstall:
 	$(MAKE) -C cmd/ipfs uninstall
diff --git a/test/Makefile b/test/Makefile
index 7b400db364a9..55b96d1430db 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -20,7 +20,8 @@ global-deps:
 deps: global-deps bins
 
 clean:
-	rm $(BINS)
+	$(MAKE) -C sharness clean
+	-rm -rf $(BINS)
 
 bins: $(BINS)