diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index f98be0b416..be72b3d41c 100644
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -253,3 +253,6 @@ AM_LOG_FLAGS = -r
 $(TESTS): legacy.run.sh
 
 test-local: check
+
+clean-local::
+	-find $(builddir) -maxdepth 1 -type d -name "*_*" | xargs rm -rf