diff --git a/Makefile.am b/Makefile.am
index bafc0ab2e..ebb385fab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,7 @@ CLEANFILES =
 EXTRA_DIST =
 INSTALL_DATA_HOOKS =
 ALL_LOCAL =
+CLEAN_LOCAL =
 CHECKS = shellcheck checkbashisms
 
 include $(top_srcdir)/config/Rules.am
@@ -87,6 +88,9 @@ distclean-local:
 		-o -name '*.gcno' \) \
 		-type f -delete
 
+PHONY += $(CLEAN_LOCAL)
+clean-local: $(CLEAN_LOCAL)
+
 PHONY += $(ALL_LOCAL)
 all-local: $(ALL_LOCAL)
 
diff --git a/contrib/pyzfs/Makefile.am b/contrib/pyzfs/Makefile.am
index 1bcbfd042..505cd3c8b 100644
--- a/contrib/pyzfs/Makefile.am
+++ b/contrib/pyzfs/Makefile.am
@@ -32,6 +32,7 @@ install-exec-local:
 	  --single-version-externally-managed \
 	  --verbose
 
-clean-local:
+CLEAN_LOCAL += pyzfs-clean-local
+pyzfs-clean-local:
 	-$(RM) -r %D%/build/ %D%/pyzfs.egg-info/
 endif
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 5a409484f..6f1dc9ccd 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -75,6 +75,10 @@ ALL_LOCAL += scripts-all-local
 scripts-all-local: %D%/common.sh
 	-SCRIPT_COMMON=$< $(srcdir)/%D%/zfs-tests.sh -c
 
+CLEAN_LOCAL += scripts-clean-local
+scripts-clean-local:
+	-$(RM) -r tests/zfs-tests/bin/
+
 INSTALL_DATA_HOOKS += scripts-install-data-hook
 scripts-install-data-hook: %D%/common.sh.in Makefile
 	-$(SED) -e '/^export BIN_DIR=/s|$$|$(bindir)|' \