diff --git a/Makefile.am b/Makefile.am
index ebb385fabc..0a73a63870 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -170,6 +170,10 @@ flake8:
 		echo "skipping flake8 because flake8 is not installed"; \
 	fi
 
+PHONY += regen-tests
+regen-tests:
+	@$(MAKE) -C tests/zfs-tests/tests regen
+
 PHONY += ctags
 ctags:
 	$(RM) tags
diff --git a/tests/zfs-tests/tests/Makefile.am b/tests/zfs-tests/tests/Makefile.am
index 4bc05c92f5..49f9f3aaa7 100644
--- a/tests/zfs-tests/tests/Makefile.am
+++ b/tests/zfs-tests/tests/Makefile.am
@@ -32,7 +32,7 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS = \
 	\
 	perf/scripts/prefetch_io.sh
 
-# These lists can be regenerated by running, on a *clean* source:
+# These lists can be regenerated by running make regen-tests at the root, or, on a *clean* source:
 #   find functional/ ! -type d ! -name .gitignore ! -name .dirstamp ! -name '*.Po' ! -executable   -name '*.in'                                              | sort | sed 's/\.in$//;s/^/\t/;$!s/$/ \\/'
 #   find functional/ ! -type d ! -name .gitignore ! -name .dirstamp ! -name '*.Po'   -executable   -name '*.in'                                              | sort | sed 's/\.in$//;s/^/\t/;$!s/$/ \\/'
 #   find functional/ ! -type d ! -name .gitignore ! -name .dirstamp ! -name '*.Po'               ! -name '*.in' ! -name '*.c'  | grep  -Fe /simd -e /tmpfile | sort | sed           's/^/\t/;$!s/$/ \\/'
@@ -43,6 +43,32 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS = \
 #
 # C programs are specced in ../Makefile.am above as part of the main Makefile
 
+find_common := find functional/ ! -type d ! -name .gitignore ! -name .dirstamp ! -name '*.Po'
+regen:
+	@$(MAKE) -C $(top_builddir) clean
+	@$(MAKE) clean
+	$(SED) $(ac_inplace) '/^# -- >8 --/q' Makefile.am
+	echo >> Makefile.am
+	echo 'nobase_nodist_datadir_zfs_tests_tests_DATA = \' >> Makefile.am
+	$(find_common) ! -executable   -name '*.in'                                              | sort | sed 's/\.in$$//;s/^/\t/;$$!s/$$/ \\/' >> Makefile.am
+	echo 'nobase_nodist_datadir_zfs_tests_tests_SCRIPTS = \' >> Makefile.am
+	$(find_common)   -executable   -name '*.in'                                              | sort | sed 's/\.in$$//;s/^/\t/;$$!s/$$/ \\/' >> Makefile.am
+	echo >> Makefile.am
+	echo 'SUBSTFILES += $$(nobase_nodist_datadir_zfs_tests_tests_DATA) $$(nobase_nodist_datadir_zfs_tests_tests_SCRIPTS)' >> Makefile.am
+	echo >> Makefile.am
+	echo 'if BUILD_LINUX' >> Makefile.am
+	echo 'nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \' >> Makefile.am
+	$(find_common)               ! -name '*.in' ! -name '*.c'  | grep  -Fe /simd -e /tmpfile | sort | sed           's/^/\t/;$$!s/$$/ \\/' >> Makefile.am
+	echo 'endif' >> Makefile.am
+	echo >> Makefile.am
+	echo 'nobase_dist_datadir_zfs_tests_tests_DATA += \' >> Makefile.am
+	$(find_common) ! -executable ! -name '*.in' ! -name '*.c'  | grep -vFe /simd -e /tmpfile | sort | sed           's/^/\t/;$$!s/$$/ \\/' >> Makefile.am
+	echo >> Makefile.am
+	echo 'nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \' >> Makefile.am
+	$(find_common)   -executable ! -name '*.in' ! -name '*.c'  | grep -vFe /simd -e /tmpfile | sort | sed           's/^/\t/;$$!s/$$/ \\/' >> Makefile.am
+
+# -- >8 --
+
 nobase_nodist_datadir_zfs_tests_tests_DATA = \
 	functional/pam/utilities.kshlib
 nobase_nodist_datadir_zfs_tests_tests_SCRIPTS = \