diff --git a/Makefile b/Makefile
index 87a2f96f4..f2d06ab35 100644
--- a/Makefile
+++ b/Makefile
@@ -220,15 +220,10 @@ clean: clean-built
 	$(Q) $(RM) ./*.img
 	$(Q) $(RM) ./*.out
 	$(Q) $(RM) ./*.bin
-	$(Q) $(RM) -r ./test/dump/
 	$(Q) $(RM) ./*.gcov ./*.gcda ./*.gcno
 	$(Q) $(RM) -r ./gcov
-	$(Q) $(RM) -r ./test/lib/
-	$(Q) $(RM) -r ./test/lib64/
 	$(Q) $(RM) protobuf-desc-gen.h
-	$(Q) $(MAKE) -C test/zdtm cleandep clean cleanout
-	$(Q) $(MAKE) -C test/libcriu clean
-	$(Q) $(MAKE) -C test/rpc clean
+	$(Q) $(MAKE) -C test $@
 
 distclean: clean
 	$(E) "  DISTCLEAN"
diff --git a/test/Makefile b/test/Makefile
index f6c7b7ba7..05ad77aee 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -31,8 +31,14 @@ override CFLAGS += -D_GNU_SOURCE
 zdtm_ct: zdtm_ct.c
 
 clean:
-	rm -rf zdtm_ct
-	$(MAKE) -C zdtm $@
+	$(RM) zdtm_ct
+	$(Q) $(RM) -r ./lib/
+	$(Q) $(RM) -r ./lib64/
+	$(Q) $(RM) -r ./dump/
+	$(Q) $(RM) *.log
+	$(Q) $(MAKE) -C zdtm cleandep clean cleanout
+	$(Q) $(MAKE) -C libcriu clean
+	$(Q) $(MAKE) -C rpc clean
 
 $(TST): zdtm_ct
 	./zdtm.sh --ct ${ZDTM_ARGS} $(@) &> $(subst /,_,$@).log || \