diff --git a/Makefile.am b/Makefile.am
index e1d311c1328f..c474f905c50a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,201 +1,200 @@
 CLEANFILES =
 EXTRA_DIST =
 INSTALL_DATA_HOOKS =
 ALL_LOCAL =
 CHECKS = shellcheck checkbashisms
 
 include $(top_srcdir)/config/Rules.am
 include $(top_srcdir)/config/CppCheck.am
 include $(top_srcdir)/config/Shellcheck.am
 include $(top_srcdir)/config/Substfiles.am
 
 ACLOCAL_AMFLAGS = -I config
 
 SUBDIRS = include
 if BUILD_LINUX
 include $(srcdir)/%D%/rpm/Makefile.am
 endif
 
 if CONFIG_USER
-SUBDIRS += . tests
 include $(srcdir)/%D%/cmd/Makefile.am
 include $(srcdir)/%D%/contrib/Makefile.am
 include $(srcdir)/%D%/etc/Makefile.am
 include $(srcdir)/%D%/lib/Makefile.am
 include $(srcdir)/%D%/man/Makefile.am
 include $(srcdir)/%D%/scripts/Makefile.am
+include $(srcdir)/%D%/tests/Makefile.am
 if BUILD_LINUX
 include $(srcdir)/%D%/udev/Makefile.am
 endif
 endif
 CPPCHECKDIRS += module
 if CONFIG_KERNEL
 SUBDIRS += module
 
 extradir = $(prefix)/src/zfs-$(VERSION)
 extra_HEADERS = zfs.release.in zfs_config.h.in
 endif
 
 EXTRA_DIST += autogen.sh copy-builtin
 EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am
 EXTRA_DIST += AUTHORS CODE_OF_CONDUCT.md COPYRIGHT LICENSE META NEWS NOTICE
 EXTRA_DIST += README.md RELEASES.md
 EXTRA_DIST += module/lua/README.zfs module/os/linux/spl/README.md
 
 # Include all the extra licensing information for modules
 EXTRA_DIST += module/icp/algs/skein/THIRDPARTYLICENSE
 EXTRA_DIST += module/icp/algs/skein/THIRDPARTYLICENSE.descrip
 EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman
 EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman.descrip
 EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl
 EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl.descrip
 EXTRA_DIST += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams
 EXTRA_DIST += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams.descrip
 EXTRA_DIST += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl
 EXTRA_DIST += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl.descrip
 EXTRA_DIST += module/os/linux/spl/THIRDPARTYLICENSE.gplv2
 EXTRA_DIST += module/os/linux/spl/THIRDPARTYLICENSE.gplv2.descrip
 EXTRA_DIST += module/zfs/THIRDPARTYLICENSE.cityhash
 EXTRA_DIST += module/zfs/THIRDPARTYLICENSE.cityhash.descrip
 
 @CODE_COVERAGE_RULES@
 
 GITREV = include/zfs_gitrev.h
 CLEANFILES += $(GITREV)
 PHONY += gitrev
 gitrev:
 	$(AM_V_GEN)$(top_srcdir)/scripts/make_gitrev.sh $(GITREV)
 
 all: gitrev
 
 PHONY += install-data-hook $(INSTALL_DATA_HOOKS)
 install-data-hook: $(INSTALL_DATA_HOOKS)
 
 PHONY += maintainer-clean-local
 maintainer-clean-local:
 	-$(RM) $(GITREV)
 
 PHONY += distclean-local
 distclean-local:
 	-$(RM) -R autom4te*.cache build
 	-find . \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \
 		-o -name .pc -o -name .hg -o -name .git \) -prune -o \
 		\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
 		-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
 		-o -name '.*.rej' -o -size 0 -o -name '*%' -o -name '.*.cmd' \
 		-o -name 'core' -o -name 'Makefile' -o -name 'Module.symvers' \
 		-o -name '*.order' -o -name '*.markers' -o -name '*.gcda' \
 		-o -name '*.gcno' \) \
 		-type f -delete
 
 PHONY += $(ALL_LOCAL)
 all-local: $(ALL_LOCAL)
 
 dist-hook:
 	$(top_srcdir)/scripts/make_gitrev.sh -D $(distdir) $(GITREV)
 	$(SED) $(ac_inplace) 's/\(Release:[[:space:]]*\).*/\1$(RELEASE)/' $(distdir)/META
 
 PHONY += codecheck $(CHECKS)
 codecheck: $(CHECKS)
 
-SHELLCHECKDIRS = tests
 SHELLCHECKSCRIPTS += autogen.sh
 
 PHONY += checkstyle
 checkstyle: codecheck commitcheck
 
 PHONY += commitcheck
 commitcheck:
 	@if git rev-parse --git-dir > /dev/null 2>&1; then \
 		${top_srcdir}/scripts/commitcheck.sh; \
 	fi
 
 if HAVE_PARALLEL
 cstyle_line = -print0 | parallel -X0 ${top_srcdir}/scripts/cstyle.pl -cpP {}
 else
 cstyle_line = -exec ${top_srcdir}/scripts/cstyle.pl -cpP {} +
 endif
 CHECKS += cstyle
 cstyle:
 	@find ${top_srcdir} -name build -prune \
 		-o -type f -name '*.[hc]' \
 		! -name 'zfs_config.*' ! -name '*.mod.c' \
 		! -name 'opt_global.h' ! -name '*_if*.h' \
 		! -name 'zstd_compat_wrapper.h' \
 		! -path './module/zstd/lib/*' \
 		! -path './include/sys/lua/*' \
 		! -path './module/lua/l*.[ch]' \
 		! -path './module/zfs/lz4.c' \
 		$(cstyle_line)
 
 filter_executable = -exec test -x '{}' \; -print
 CHECKS += testscheck
 testscheck:
 	@[ $$(find $(top_srcdir)/tests/zfs-tests -type f \
 		\( -name '*.ksh' -not $(filter_executable) \) -o \
 		\( -name '*.kshlib' $(filter_executable) \) -o \
 		\( -name '*.shlib' $(filter_executable) \) -o \
 		\( -name '*.cfg' $(filter_executable) \) | \
 		tee /dev/stderr | wc -l) -eq 0 ]
 
 CHECKS += vcscheck
 vcscheck:
 	@if git rev-parse --git-dir > /dev/null 2>&1; then \
 		git ls-files . --exclude-standard --others | \
 		awk '{c++; print} END {if(c>0) exit 1}' ; \
 	fi
 
 CHECKS += zstdcheck
 zstdcheck:
 	@$(MAKE) -C module check-zstd-symbols
 
 PHONY += lint
 lint: cppcheck paxcheck
 
 PHONY += paxcheck
 paxcheck:
 	@if type scanelf > /dev/null 2>&1; then \
 		${top_srcdir}/scripts/paxcheck.sh ${top_builddir}; \
 	else \
 		echo "skipping paxcheck because scanelf is not installed"; \
 	fi
 
 CHECKS += flake8
 flake8:
 	@if type flake8 > /dev/null 2>&1; then \
 		flake8 ${top_srcdir}; \
 	else \
 		echo "skipping flake8 because flake8 is not installed"; \
 	fi
 
 PHONY += ctags
 ctags:
 	$(RM) tags
 	find $(top_srcdir) -name '.?*' -prune \
 		-o -type f -name '*.[hcS]' -exec ctags -a {} +
 
 PHONY += etags
 etags:
 	$(RM) TAGS
 	find $(top_srcdir) -name '.?*' -prune \
 		-o -type f -name '*.[hcS]' -exec etags -a {} +
 
 PHONY += cscopelist
 cscopelist:
 	find $(top_srcdir) -name '.?*' -prune \
 		-o -type f -name '*.[hc]' -print >cscope.files
 
 PHONY += tags
 tags: ctags etags
 
 PHONY += pkg pkg-dkms pkg-kmod pkg-utils
 pkg: @DEFAULT_PACKAGE@
 pkg-dkms: @DEFAULT_PACKAGE@-dkms
 pkg-kmod: @DEFAULT_PACKAGE@-kmod
 pkg-utils: @DEFAULT_PACKAGE@-utils
 
 include config/rpm.am
 include config/deb.am
 include config/tgz.am
 
 .PHONY: $(PHONY)
diff --git a/config/CppCheck.am b/config/CppCheck.am
index d0f1d6f1920f..0c2502f3ddde 100644
--- a/config/CppCheck.am
+++ b/config/CppCheck.am
@@ -1,21 +1,21 @@
 #
 # Default rules for running cppcheck against the user space components.
 #
 
 PHONY += cppcheck
 
 CPPCHECKFLAGS  = --std=c99 --quiet --max-configs=1 --error-exitcode=2
 CPPCHECKFLAGS += --inline-suppr -U_KERNEL
 
 CPPCHECKDIRS    =
 CPPCHECKTARGETS =
 
 cppcheck-recursive-%:
-	$(MAKE) -C $(subst ^,/,$(subst cppcheck-recursive-,,$@)) cppcheck
+	$(MAKE) -C $(subst cppcheck-recursive-,,$@) cppcheck
 
 _CTGT = $(subst cppcheck-for-,,$@)
 cppcheck-for-%:
 	@[ -n "$($(_CTGT)_SOURCES)$(dist_$(_CTGT)_SOURCES)$(nodist_$(_CTGT)_SOURCES)" ]
 	$(CPPCHECK) -j$(CPU_COUNT) $(CPPCHECKFLAGS) $(patsubst -U%,,$(patsubst -D%,,$(filter-out $(AM_CPPFLAGS_NOCHECK),$(or $($(_CTGT)_CPPFLAGS),$(AM_CPPFLAGS))))) $($(_CTGT)_SOURCES) $(dist_$(_CTGT)_SOURCES) $(nodist_$(_CTGT)_SOURCES)
 
 cppcheck: $(addprefix cppcheck-for-,$(subst -,_,$(subst .,_,$(subst /,_,$(CPPCHECKTARGETS))))) $(addprefix cppcheck-recursive-,$(CPPCHECKDIRS))
diff --git a/config/Shellcheck.am b/config/Shellcheck.am
index 9002b76dee3a..878919575321 100644
--- a/config/Shellcheck.am
+++ b/config/Shellcheck.am
@@ -1,46 +1,40 @@
 # Global ShellCheck exclusions:
 #
 # ShellCheck can't follow non-constant source. Use a directive to specify location. [SC1090]
 # Not following: a was not specified as input (see shellcheck -x). [SC1091]
 # Prefer putting braces around variable references even when not strictly required. [SC2250]
 # In POSIX sh, 'local' is undefined. [SC2039] # older ShellCheck versions
 # In POSIX sh, 'local' is undefined. [SC3043] # newer ShellCheck versions
 
 SHELLCHECKSCRIPTS =
 
 JUST_SHELLCHECK_OPTS    = $(addprefix shellcheck-here-,$(subst /,^,$(1)))
 JUST_CHECKBASHISMS_OPTS = $(addprefix checkbashisms-here-,$(subst /,^,$(1)))
 SHELLCHECK_OPTS         = $(call JUST_SHELLCHECK_OPTS,$(1)) $(call JUST_CHECKBASHISMS_OPTS,$(1))
 
-PHONY += shellcheck shellcheck-recursive
-
-shellcheck-recursive:
-	@set -e; for dir in $(SHELLCHECKDIRS); do $(MAKE) -C $$dir shellcheck; done
+PHONY += shellcheck
 
 _STGT = $(subst ^,/,$(subst shellcheck-here-,,$@))
 shellcheck-here-%:
 if HAVE_SHELLCHECK
 	shellcheck --format=gcc --enable=all --exclude=SC1090,SC1091,SC2039,SC2250,SC3043 $$([ -n "$(SHELLCHECK_SHELL)" ] && echo "--shell=$(SHELLCHECK_SHELL)") "$$([ -e "$(_STGT)" ] || echo "$(srcdir)/")$(_STGT)"
 else
 	@echo "skipping shellcheck of" $(_STGT) "because shellcheck is not installed"
 endif
 
-shellcheck: $(SHELLCHECKSCRIPTS) $(call JUST_SHELLCHECK_OPTS,$(SHELLCHECKSCRIPTS)) shellcheck-recursive
-
+shellcheck: $(SHELLCHECKSCRIPTS) $(call JUST_SHELLCHECK_OPTS,$(SHELLCHECKSCRIPTS))
 
-PHONY += checkbashisms checkbashisms-recursive
 
-checkbashisms-recursive:
-	@set -e; for dir in $(SHELLCHECKDIRS); do $(MAKE) -C $$dir checkbashisms; done
+PHONY += checkbashisms
 
 # command -v *is* specified by POSIX and every shell in existence supports it
 _BTGT = $(subst ^,/,$(subst checkbashisms-here-,,$@))
 checkbashisms-here-%:
 if HAVE_CHECKBASHISMS
 	! { [ -n "$(SHELLCHECK_SHELL)" ] && echo '#!/bin/$(SHELLCHECK_SHELL)'; cat "$$([ -e "$(_BTGT)" ] || echo "$(srcdir)/")$(_BTGT)"; } | \
 	checkbashisms -npx 2>&1 | grep -vFe "'command' with option other than -p" -e 'command -v' -e 'any possible bashisms' $(CHECKBASHISMS_IGNORE) >&2
 else
 	@echo "skipping checkbashisms of" $(_BTGT) "because checkbashisms is not installed"
 endif
 
-checkbashisms: $(SHELLCHECKSCRIPTS) $(call JUST_CHECKBASHISMS_OPTS,$(SHELLCHECKSCRIPTS)) checkbashisms-recursive
+checkbashisms: $(SHELLCHECKSCRIPTS) $(call JUST_CHECKBASHISMS_OPTS,$(SHELLCHECKSCRIPTS))
diff --git a/configure.ac b/configure.ac
index c5af86c605c7..77859f87e83b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,272 +1,261 @@
 /*
  * This file is part of OpenZFS.
  *
  * Copyright (c) 2009 Lawrence Livermore National Security, LLC.
  * Produced at Lawrence Livermore National Laboratory
  * Written by:
  *         Brian Behlendorf <behlendorf1@llnl.gov>,
  *         Herb Wartens <wartens2@llnl.gov>,
  *         Jim Garlick <garlick@llnl.gov>
  * LLNL-CODE-403049
  *
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
  * Common Development and Distribution License, Version 1.0 only
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
  * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  * If applicable, add the following below this CDDL HEADER, with the
  * fields enclosed by brackets "[]" replaced with your own identifying
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  */
 
 AC_INIT(m4_esyscmd(awk '/^Name:/ {printf $2}' META),
 	m4_esyscmd(awk '/^Version:/ {printf $2}' META))
 AC_LANG(C)
 ZFS_AC_META
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([config])
 AC_CANONICAL_TARGET
 AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AM_INIT_AUTOMAKE([subdir-objects foreign])
 AC_CONFIG_HEADERS([zfs_config.h], [
 	(mv zfs_config.h zfs_config.h.tmp &&
 	awk -f ${ac_srcdir}/config/config.awk zfs_config.h.tmp >zfs_config.h &&
 	rm zfs_config.h.tmp) || exit 1])
 
 LT_INIT
 AC_PROG_INSTALL
 AC_PROG_CC
 AC_PROG_LN_S
 PKG_PROG_PKG_CONFIG
 AM_PROG_AS
 AM_PROG_CC_C_O
 AX_CODE_COVERAGE
 _AM_PROG_TAR(pax)
 
 ZFS_AC_LICENSE
 ZFS_AC_CONFIG
 ZFS_AC_PACKAGE
 ZFS_AC_DEBUG
 ZFS_AC_DEBUGINFO
 ZFS_AC_DEBUG_KMEM
 ZFS_AC_DEBUG_KMEM_TRACKING
 ZFS_AC_DEBUG_INVARIANTS
 
 AC_CONFIG_FILES([
 	Makefile
 	include/Makefile
 	lib/libzfs/libzfs.pc
 	lib/libzfsbootenv/libzfsbootenv.pc
 	lib/libzfs_core/libzfs_core.pc
 	module/Kbuild
 	module/Makefile
 	rpm/generic/zfs-dkms.spec
 	rpm/generic/zfs-kmod.spec
 	rpm/generic/zfs.spec
 	rpm/redhat/zfs-dkms.spec
 	rpm/redhat/zfs-kmod.spec
 	rpm/redhat/zfs.spec
-	tests/Makefile
-	tests/runfiles/Makefile
-	tests/test-runner/Makefile
-	tests/test-runner/bin/Makefile
-	tests/test-runner/include/Makefile
-	tests/zfs-tests/Makefile
-	tests/zfs-tests/callbacks/Makefile
-	tests/zfs-tests/cmd/Makefile
-	tests/zfs-tests/include/Makefile
 	tests/zfs-tests/tests/Makefile
 	tests/zfs-tests/tests/functional/Makefile
 	tests/zfs-tests/tests/functional/acl/Makefile
 	tests/zfs-tests/tests/functional/acl/off/Makefile
 	tests/zfs-tests/tests/functional/acl/posix/Makefile
 	tests/zfs-tests/tests/functional/acl/posix-sa/Makefile
 	tests/zfs-tests/tests/functional/alloc_class/Makefile
 	tests/zfs-tests/tests/functional/arc/Makefile
 	tests/zfs-tests/tests/functional/atime/Makefile
 	tests/zfs-tests/tests/functional/bootfs/Makefile
 	tests/zfs-tests/tests/functional/btree/Makefile
 	tests/zfs-tests/tests/functional/cache/Makefile
 	tests/zfs-tests/tests/functional/cachefile/Makefile
 	tests/zfs-tests/tests/functional/casenorm/Makefile
 	tests/zfs-tests/tests/functional/channel_program/Makefile
 	tests/zfs-tests/tests/functional/channel_program/lua_core/Makefile
 	tests/zfs-tests/tests/functional/channel_program/synctask_core/Makefile
 	tests/zfs-tests/tests/functional/chattr/Makefile
 	tests/zfs-tests/tests/functional/checksum/Makefile
 	tests/zfs-tests/tests/functional/clean_mirror/Makefile
 	tests/zfs-tests/tests/functional/cli_root/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zdb/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_bookmark/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_change-key/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_clone/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_copies/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_create/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_destroy/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_diff/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_get/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_ids_to_path/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_inherit/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_jail/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_load-key/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_program/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_promote/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_property/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_receive/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_rename/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_reservation/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_rollback/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_send/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_set/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_share/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_sysfs/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_unload-key/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_unmount/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_unshare/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_upgrade/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zfs_wait/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zhack/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_add/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_attach/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_clear/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_create/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_destroy/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_detach/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_events/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_expand/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_export/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_get/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_history/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_import/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_import/blockfiles/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_initialize/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_offline/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_online/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_remove/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_reopen/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_replace/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_resilver/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_scrub/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_set/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_split/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_status/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_sync/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_trim/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_wait/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_wait/scan/Makefile
 	tests/zfs-tests/tests/functional/cli_user/Makefile
 	tests/zfs-tests/tests/functional/cli_user/misc/Makefile
 	tests/zfs-tests/tests/functional/cli_user/zfs_list/Makefile
 	tests/zfs-tests/tests/functional/cli_user/zpool_iostat/Makefile
 	tests/zfs-tests/tests/functional/cli_user/zpool_list/Makefile
 	tests/zfs-tests/tests/functional/cli_user/zpool_status/Makefile
 	tests/zfs-tests/tests/functional/compression/Makefile
 	tests/zfs-tests/tests/functional/cp_files/Makefile
 	tests/zfs-tests/tests/functional/crtime/Makefile
 	tests/zfs-tests/tests/functional/ctime/Makefile
 	tests/zfs-tests/tests/functional/deadman/Makefile
 	tests/zfs-tests/tests/functional/delegate/Makefile
 	tests/zfs-tests/tests/functional/devices/Makefile
 	tests/zfs-tests/tests/functional/dos_attributes/Makefile
 	tests/zfs-tests/tests/functional/events/Makefile
 	tests/zfs-tests/tests/functional/exec/Makefile
 	tests/zfs-tests/tests/functional/fallocate/Makefile
 	tests/zfs-tests/tests/functional/fault/Makefile
 	tests/zfs-tests/tests/functional/features/Makefile
 	tests/zfs-tests/tests/functional/features/async_destroy/Makefile
 	tests/zfs-tests/tests/functional/features/large_dnode/Makefile
 	tests/zfs-tests/tests/functional/grow/Makefile
 	tests/zfs-tests/tests/functional/history/Makefile
-	tests/zfs-tests/tests/functional/hkdf/Makefile
 	tests/zfs-tests/tests/functional/inheritance/Makefile
 	tests/zfs-tests/tests/functional/inuse/Makefile
 	tests/zfs-tests/tests/functional/io/Makefile
 	tests/zfs-tests/tests/functional/l2arc/Makefile
 	tests/zfs-tests/tests/functional/large_files/Makefile
 	tests/zfs-tests/tests/functional/largest_pool/Makefile
 	tests/zfs-tests/tests/functional/libzfs/Makefile
 	tests/zfs-tests/tests/functional/limits/Makefile
 	tests/zfs-tests/tests/functional/link_count/Makefile
 	tests/zfs-tests/tests/functional/log_spacemap/Makefile
 	tests/zfs-tests/tests/functional/migration/Makefile
 	tests/zfs-tests/tests/functional/mmap/Makefile
 	tests/zfs-tests/tests/functional/mmp/Makefile
 	tests/zfs-tests/tests/functional/mount/Makefile
 	tests/zfs-tests/tests/functional/mv_files/Makefile
 	tests/zfs-tests/tests/functional/nestedfs/Makefile
 	tests/zfs-tests/tests/functional/no_space/Makefile
 	tests/zfs-tests/tests/functional/nopwrite/Makefile
 	tests/zfs-tests/tests/functional/online_offline/Makefile
 	tests/zfs-tests/tests/functional/pam/Makefile
 	tests/zfs-tests/tests/functional/pool_checkpoint/Makefile
 	tests/zfs-tests/tests/functional/pool_names/Makefile
 	tests/zfs-tests/tests/functional/poolversion/Makefile
 	tests/zfs-tests/tests/functional/privilege/Makefile
 	tests/zfs-tests/tests/functional/procfs/Makefile
 	tests/zfs-tests/tests/functional/projectquota/Makefile
 	tests/zfs-tests/tests/functional/pyzfs/Makefile
 	tests/zfs-tests/tests/functional/quota/Makefile
 	tests/zfs-tests/tests/functional/raidz/Makefile
 	tests/zfs-tests/tests/functional/redacted_send/Makefile
 	tests/zfs-tests/tests/functional/redundancy/Makefile
 	tests/zfs-tests/tests/functional/refquota/Makefile
 	tests/zfs-tests/tests/functional/refreserv/Makefile
 	tests/zfs-tests/tests/functional/removal/Makefile
 	tests/zfs-tests/tests/functional/rename_dirs/Makefile
 	tests/zfs-tests/tests/functional/replacement/Makefile
 	tests/zfs-tests/tests/functional/reservation/Makefile
 	tests/zfs-tests/tests/functional/rootpool/Makefile
 	tests/zfs-tests/tests/functional/rsend/Makefile
 	tests/zfs-tests/tests/functional/scrub_mirror/Makefile
 	tests/zfs-tests/tests/functional/simd/Makefile
 	tests/zfs-tests/tests/functional/slog/Makefile
 	tests/zfs-tests/tests/functional/snapshot/Makefile
 	tests/zfs-tests/tests/functional/snapused/Makefile
 	tests/zfs-tests/tests/functional/sparse/Makefile
 	tests/zfs-tests/tests/functional/stat/Makefile
 	tests/zfs-tests/tests/functional/suid/Makefile
 	tests/zfs-tests/tests/functional/threadsappend/Makefile
 	tests/zfs-tests/tests/functional/tmpfile/Makefile
 	tests/zfs-tests/tests/functional/trim/Makefile
 	tests/zfs-tests/tests/functional/truncate/Makefile
 	tests/zfs-tests/tests/functional/upgrade/Makefile
 	tests/zfs-tests/tests/functional/user_namespace/Makefile
 	tests/zfs-tests/tests/functional/userquota/Makefile
 	tests/zfs-tests/tests/functional/vdev_zaps/Makefile
 	tests/zfs-tests/tests/functional/write_dirs/Makefile
 	tests/zfs-tests/tests/functional/xattr/Makefile
 	tests/zfs-tests/tests/functional/zpool_influxdb/Makefile
 	tests/zfs-tests/tests/functional/zvol/Makefile
 	tests/zfs-tests/tests/functional/zvol/zvol_ENOSPC/Makefile
 	tests/zfs-tests/tests/functional/zvol/zvol_cli/Makefile
 	tests/zfs-tests/tests/functional/zvol/zvol_misc/Makefile
 	tests/zfs-tests/tests/functional/zvol/zvol_swap/Makefile
 	tests/zfs-tests/tests/perf/Makefile
 	tests/zfs-tests/tests/perf/fio/Makefile
 	tests/zfs-tests/tests/perf/regression/Makefile
 	tests/zfs-tests/tests/perf/scripts/Makefile
-	tests/zfs-tests/tests/stress/Makefile
 	zfs.release
 ])
 
 
 AC_OUTPUT
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e839957d4c98..d6ca957eccc8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,8 +1,30 @@
-PHONY =
-include $(top_srcdir)/config/Shellcheck.am
+include $(srcdir)/%D%/zfs-tests/Makefile.am
 
-SUBDIRS = runfiles test-runner zfs-tests
 
-EXTRA_DIST = README.md
+scripts_test_runner_bindir = $(datadir)/$(PACKAGE)/test-runner/bin
+scripts_test_runner_bin_SCRIPTS = \
+	%D%/test-runner/bin/test-runner.py \
+	%D%/test-runner/bin/zts-report.py
 
-SHELLCHECKSCRIPTS += $(shell find $(srcdir) -name '*.sh')
+SUBSTFILES += $(scripts_test_runner_bin_SCRIPTS)
+
+
+scripts_test_runner_includedir = $(datadir)/$(PACKAGE)/test-runner/include
+dist_scripts_test_runner_include_DATA = \
+	%D%/test-runner/include/logapi.shlib
+
+
+scripts_runfilesdir = $(datadir)/$(PACKAGE)/runfiles
+dist_scripts_runfiles_DATA = \
+	%D%/runfiles/common.run \
+	%D%/runfiles/freebsd.run \
+	%D%/runfiles/linux.run \
+	%D%/runfiles/longevity.run \
+	%D%/runfiles/perf-regression.run \
+	%D%/runfiles/sanity.run \
+	%D%/runfiles/sunos.run
+
+
+EXTRA_DIST += $(addprefix %D%/,README.md)
+
+SHELLCHECKSCRIPTS += $(shell find $(srcdir)/%D% -name '*.sh')
diff --git a/tests/runfiles/Makefile.am b/tests/runfiles/Makefile.am
deleted file mode 100644
index 278e94934fe1..000000000000
--- a/tests/runfiles/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-pkgdatadir = $(datadir)/@PACKAGE@/runfiles
-dist_pkgdata_DATA = \
-	common.run \
-	freebsd.run \
-	linux.run \
-	longevity.run \
-	perf-regression.run \
-	sanity.run \
-	sunos.run
diff --git a/tests/test-runner/Makefile.am b/tests/test-runner/Makefile.am
deleted file mode 100644
index 4d4b639dbeac..000000000000
--- a/tests/test-runner/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = bin include
diff --git a/tests/test-runner/bin/Makefile.am b/tests/test-runner/bin/Makefile.am
deleted file mode 100644
index 74b98fa69fc3..000000000000
--- a/tests/test-runner/bin/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-CLEANFILES =
-EXTRA_DIST =
-include $(top_srcdir)/config/Substfiles.am
-
-pkgdatadir = $(datadir)/@PACKAGE@/test-runner/bin
-pkgdata_SCRIPTS = \
-	test-runner.py \
-	zts-report.py
-
-SUBSTFILES += $(pkgdata_SCRIPTS)
diff --git a/tests/test-runner/include/Makefile.am b/tests/test-runner/include/Makefile.am
deleted file mode 100644
index 62817ded8a34..000000000000
--- a/tests/test-runner/include/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-pkgdatadir = $(datadir)/@PACKAGE@/test-runner/include
-
-dist_pkgdata_DATA = \
-	logapi.shlib
diff --git a/tests/zfs-tests/Makefile.am b/tests/zfs-tests/Makefile.am
index ef4e6be9e980..f8166352489e 100644
--- a/tests/zfs-tests/Makefile.am
+++ b/tests/zfs-tests/Makefile.am
@@ -1 +1,48 @@
-SUBDIRS = cmd include tests callbacks
+SUBDIRS += %D%/tests
+
+include $(srcdir)/%D%/cmd/Makefile.am
+
+
+scripts_zfs_tests_functional_libzfsdir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/libzfs
+scripts_zfs_tests_functional_libzfs_PROGRAMS = %D%/tests/functional/libzfs/many_fds
+%C%_tests_functional_libzfs_many_fds_LDADD = \
+	libzfs.la
+
+scripts_zfs_tests_functional_hkdfdir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/hkdf
+scripts_zfs_tests_functional_hkdf_PROGRAMS = %D%/tests/functional/hkdf/hkdf_test
+%C%_tests_functional_hkdf_hkdf_test_LDADD = \
+	libzpool.la
+
+if BUILD_LINUX
+scripts_zfs_tests_functional_tmpfiledir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/tmpfile
+scripts_zfs_tests_functional_tmpfile_PROGRAMS = \
+	%D%/tests/functional/tmpfile/tmpfile_001_pos \
+	%D%/tests/functional/tmpfile/tmpfile_002_pos \
+	%D%/tests/functional/tmpfile/tmpfile_003_pos \
+	%D%/tests/functional/tmpfile/tmpfile_stat_mode \
+	%D%/tests/functional/tmpfile/tmpfile_test
+endif
+
+
+scripts_zfs_tests_callbacksdir = $(datadir)/$(PACKAGE)/zfs-tests/callbacks
+dist_scripts_zfs_tests_callbacks_SCRIPTS = \
+	%D%/callbacks/zfs_dbgmsg.ksh \
+	%D%/callbacks/zfs_dmesg.ksh \
+	%D%/callbacks/zfs_failsafe.ksh \
+	%D%/callbacks/zfs_mmp.ksh
+
+
+scripts_zfs_tests_includedir = $(datadir)/$(PACKAGE)/zfs-tests/include
+dist_scripts_zfs_tests_include_DATA = \
+	%D%/include/blkdev.shlib \
+	%D%/include/commands.cfg \
+	%D%/include/libtest.shlib \
+	%D%/include/math.shlib \
+	%D%/include/properties.shlib \
+	%D%/include/tunables.cfg \
+	%D%/include/zpool_script.shlib
+
+nodist_scripts_zfs_tests_include_DATA = \
+	%D%/include/default.cfg
+
+SUBSTFILES += $(nodist_scripts_zfs_tests_include_DATA)
diff --git a/tests/zfs-tests/callbacks/Makefile.am b/tests/zfs-tests/callbacks/Makefile.am
deleted file mode 100644
index 512a737bb5c9..000000000000
--- a/tests/zfs-tests/callbacks/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/callbacks
-dist_pkgdata_SCRIPTS = \
-	zfs_failsafe.ksh \
-	zfs_dbgmsg.ksh \
-	zfs_dmesg.ksh \
-	zfs_mmp.ksh
diff --git a/tests/zfs-tests/cmd/Makefile.am b/tests/zfs-tests/cmd/Makefile.am
index 266d2cdb9c08..b5609b523d05 100644
--- a/tests/zfs-tests/cmd/Makefile.am
+++ b/tests/zfs-tests/cmd/Makefile.am
@@ -1,187 +1,127 @@
-include $(top_srcdir)/config/Rules.am
+scripts_zfs_tests_bindir = $(datadir)/$(PACKAGE)/zfs-tests/bin
 
-pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin
 
+scripts_zfs_tests_bin_PROGRAMS  = %D%/chg_usr_exec
+scripts_zfs_tests_bin_PROGRAMS += %D%/cp_files
+scripts_zfs_tests_bin_PROGRAMS += %D%/ctime
+scripts_zfs_tests_bin_PROGRAMS += %D%/dir_rd_update
+scripts_zfs_tests_bin_PROGRAMS += %D%/dosmode_readonly_write
+scripts_zfs_tests_bin_PROGRAMS += %D%/get_diff
+scripts_zfs_tests_bin_PROGRAMS += %D%/rename_dir
+scripts_zfs_tests_bin_PROGRAMS += %D%/suid_write_to_file
+scripts_zfs_tests_bin_PROGRAMS += %D%/truncate_test
+scripts_zfs_tests_bin_PROGRAMS += %D%/zfs_diff-socket
 
-pkgexec_PROGRAMS = badsend
-badsend_SOURCES = badsend.c
-badsend_LDADD = \
-	$(abs_top_builddir)/libzfs_core.la \
-	$(abs_top_builddir)/libzfs.la \
-	$(abs_top_builddir)/libnvpair.la
 
+scripts_zfs_tests_bin_PROGRAMS += %D%/badsend
+%C%_badsend_LDADD = \
+	libzfs_core.la \
+	libzfs.la \
+	libnvpair.la
 
-pkgexec_PROGRAMS += btree_test
-btree_test_SOURCES = btree_test.c
-btree_test_CPPFLAGS = $(AM_CPPFLAGS) $(FORCEDEBUG_CPPFLAGS)
-btree_test_LDADD = \
-	$(abs_top_builddir)/libzpool.la \
-	$(abs_top_builddir)/libzfs_core.la
 
-
-pkgexec_PROGRAMS += chg_usr_exec
-chg_usr_exec_SOURCES = chg_usr_exec.c
+scripts_zfs_tests_bin_PROGRAMS += %D%/btree_test
+%C%_btree_test_CPPFLAGS = $(AM_CPPFLAGS) $(FORCEDEBUG_CPPFLAGS)
+%C%_btree_test_LDADD = \
+	libzpool.la \
+	libzfs_core.la
 
 
 if WANT_DEVNAME2DEVID
-pkgexec_PROGRAMS += devname2devid
-devname2devid_SOURCES = devname2devid.c
-devname2devid_CFLAGS = $(AM_CFLAGS) $(LIBUDEV_CFLAGS)
-devname2devid_LDADD = $(LIBUDEV_LIBS)
+scripts_zfs_tests_bin_PROGRAMS += %D%/devname2devid
+%C%_devname2devid_CFLAGS = $(AM_CFLAGS) $(LIBUDEV_CFLAGS)
+%C%_devname2devid_LDADD = $(LIBUDEV_LIBS)
 endif
 
 
-pkgexec_PROGRAMS += dir_rd_update
-dir_rd_update_SOURCES = dir_rd_update.c
-
-
-pkgexec_PROGRAMS += draid
-draid_CFLAGS = $(AM_CFLAGS) $(ZLIB_CFLAGS)
-draid_SOURCES = draid.c
-draid_LDADD = \
-	$(abs_top_builddir)/libzpool.la \
-	$(abs_top_builddir)/libnvpair.la
-draid_LDADD += $(ZLIB_LIBS)
-
-
-EXTRA_DIST = file/file_common.h
-pkgexec_PROGRAMS += file_check file_trunc file_write largest_file randwritecomp
-file_check_SOURCES = file/file_check.c
-file_trunc_SOURCES = file/file_trunc.c
-file_write_SOURCES = file/file_write.c
-largest_file_SOURCES = file/largest_file.c
-randwritecomp_SOURCES = file/randwritecomp.c
+scripts_zfs_tests_bin_PROGRAMS += %D%/draid
+%C%_draid_CFLAGS = $(AM_CFLAGS) $(ZLIB_CFLAGS)
+%C%_draid_LDADD = \
+	libzpool.la \
+	libnvpair.la
+%C%_draid_LDADD += $(ZLIB_LIBS)
 
 
-pkgexec_PROGRAMS += get_diff
-get_diff_SOURCES = get_diff.c
+EXTRA_DIST += $(addprefix %D%/,file/file_common.h)
+scripts_zfs_tests_bin_PROGRAMS += %D%/file_check %D%/file_trunc %D%/file_write %D%/largest_file %D%/randwritecomp
+%C%_file_check_SOURCES    = %D%/file/file_check.c
+%C%_file_trunc_SOURCES    = %D%/file/file_trunc.c
+%C%_file_write_SOURCES    = %D%/file/file_write.c
+%C%_largest_file_SOURCES  = %D%/file/largest_file.c
+%C%_randwritecomp_SOURCES = %D%/file/randwritecomp.c
 
 
-pkgexec_PROGRAMS += libzfs_input_check
-libzfs_input_check_SOURCES = libzfs_input_check.c
-if BUILD_FREEBSD
-libzfs_input_check_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/include/os/freebsd/zfs
-endif
-if BUILD_LINUX
-libzfs_input_check_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/include/os/linux/zfs
-endif
-libzfs_input_check_LDADD = \
-	$(abs_top_builddir)/libzfs_core.la \
-	$(abs_top_builddir)/libnvpair.la
-
+scripts_zfs_tests_bin_PROGRAMS += %D%/libzfs_input_check
+%C%_libzfs_input_check_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/include/os/@ac_system_l@/zfs
+%C%_libzfs_input_check_LDADD = \
+	libzfs_core.la \
+	libnvpair.la
 
 
-pkgexec_PROGRAMS += mkbusy mkfile mkfiles mktree
-mkbusy_SOURCES = mkbusy.c
-mkfile_SOURCES = mkfile.c
-mkfile_LDADD = $(LTLIBINTL)
-mkfiles_SOURCES = mkfiles.c
-mktree_SOURCES = mktree.c
+scripts_zfs_tests_bin_PROGRAMS += %D%/mkbusy %D%/mkfile %D%/mkfiles %D%/mktree
+%C%_mkfile_LDADD = $(LTLIBINTL)
 
 
-pkgexec_PROGRAMS += mmap_exec mmap_seek mmap_sync mmapwrite readmmap
-mmap_exec_SOURCES = mmap_exec.c
-mmap_seek_SOURCES = mmap_seek.c
-mmap_sync_SOURCES = mmap_sync.c
-mmapwrite_SOURCES = mmapwrite.c
-mmapwrite_LDADD = -lpthread
-readmmap_SOURCES = readmmap.c
+scripts_zfs_tests_bin_PROGRAMS += %D%/mmap_exec %D%/mmap_seek %D%/mmap_sync %D%/mmapwrite %D%/readmmap
+%C%_mmapwrite_LDADD = -lpthread
 
 if WANT_MMAP_LIBAIO
-pkgexec_PROGRAMS += mmap_libaio
-mmap_libaio_SOURCES = mmap_libaio.c
-mmap_libaio_CFLAGS = $(AM_CFLAGS) $(LIBAIO_CFLAGS)
-mmap_libaio_LDADD = $(LIBAIO_LIBS)
+scripts_zfs_tests_bin_PROGRAMS += %D%/mmap_libaio
+%C%_mmap_libaio_CFLAGS = $(AM_CFLAGS) $(LIBAIO_CFLAGS)
+%C%_mmap_libaio_LDADD  = $(LIBAIO_LIBS)
 endif
 
 
-pkgexec_PROGRAMS += nvlist_to_lua
-nvlist_to_lua_SOURCES = nvlist_to_lua.c
-nvlist_to_lua_LDADD = \
-	$(abs_top_builddir)/libzfs_core.la \
-	$(abs_top_builddir)/libnvpair.la
+scripts_zfs_tests_bin_PROGRAMS += %D%/nvlist_to_lua
+%C%_nvlist_to_lua_LDADD = \
+	libzfs_core.la \
+	libnvpair.la
 
+scripts_zfs_tests_bin_PROGRAMS += %D%/rm_lnkcnt_zero_file
+%C%_rm_lnkcnt_zero_file_LDADD = -lpthread
 
-pkgexec_PROGRAMS += rename_dir
-rename_dir_SOURCES = rename_dir.c
+scripts_zfs_tests_bin_PROGRAMS += %D%/send_doall
+%C%_send_doall_LDADD = \
+	libzfs_core.la \
+	libzfs.la \
+	libnvpair.la
 
-pkgexec_PROGRAMS += rm_lnkcnt_zero_file
-rm_lnkcnt_zero_file_SOURCES = rm_lnkcnt_zero_file.c
-rm_lnkcnt_zero_file_LDADD = -lpthread
+scripts_zfs_tests_bin_PROGRAMS += %D%/stride_dd
+%C%_stride_dd_LDADD = -lrt
 
-pkgexec_PROGRAMS += send_doall
-send_doall_SOURCES = send_doall.c
-send_doall_LDADD = \
-	$(abs_top_builddir)/libzfs_core.la \
-	$(abs_top_builddir)/libzfs.la \
-	$(abs_top_builddir)/libnvpair.la
+scripts_zfs_tests_bin_PROGRAMS += %D%/threadsappend
+%C%_threadsappend_LDADD = -lpthread
 
-pkgexec_PROGRAMS += stride_dd
-stride_dd_SOURCES = stride_dd.c
-stride_dd_LDADD = -lrt
+scripts_zfs_tests_bin_PROGRAMS += %D%/ereports
+%C%_ereports_LDADD = \
+	libnvpair.la \
+	libzfs.la
 
-pkgexec_PROGRAMS += threadsappend
-threadsappend_SOURCES = threadsappend.c
-threadsappend_LDADD = -lpthread
 
-pkgexec_PROGRAMS += suid_write_to_file
-suid_write_to_file_SOURCES = suid_write_to_file.c
-
-pkgexec_PROGRAMS += cp_files
-cp_files_SOURCES = cp_files.c
-
-pkgexec_PROGRAMS += ctime
-ctime_SOURCES = ctime.c
-
-pkgexec_PROGRAMS += truncate_test
-truncate_test_SOURCES = truncate_test.c
-
-pkgexec_PROGRAMS += ereports
-ereports_SOURCES = ereports.c
-ereports_LDADD = \
-	$(abs_top_builddir)/libnvpair.la \
-	$(abs_top_builddir)/libzfs.la
-
-pkgexec_PROGRAMS += zfs_diff-socket
-zfs_diff_socket_SOURCES = zfs_diff-socket.c
-
-pkgexec_PROGRAMS += dosmode_readonly_write
-dosmode_readonly_write_SOURCES = dosmode_readonly_write.c
-
-
-pkgexec_PROGRAMS += edonr_test skein_test sha2_test
-skein_test_SOURCES = checksum/skein_test.c
-sha2_test_SOURCES = checksum/sha2_test.c
-edonr_test_SOURCES = checksum/edonr_test.c
-skein_test_LDADD = \
-	$(abs_top_builddir)/libicp.la \
-	$(abs_top_builddir)/libspl_assert.la
-sha2_test_LDADD = \
-	$(abs_top_builddir)/libicp.la \
-	$(abs_top_builddir)/libspl_assert.la
-edonr_test_LDADD = \
-	$(abs_top_builddir)/libicp.la \
-	$(abs_top_builddir)/libspl_assert.la
+scripts_zfs_tests_bin_PROGRAMS += %D%/edonr_test %D%/skein_test %D%/sha2_test
+%C%_skein_test_SOURCES = %D%/checksum/skein_test.c
+%C%_sha2_test_SOURCES  = %D%/checksum/sha2_test.c
+%C%_edonr_test_SOURCES = %D%/checksum/edonr_test.c
+%C%_skein_test_LDADD = \
+	libicp.la \
+	libspl_assert.la
+%C%_sha2_test_LDADD  = $(%C%_skein_test_LDADD)
+%C%_edonr_test_LDADD = $(%C%_skein_test_LDADD)
 
 
 if BUILD_LINUX
-pkgexec_PROGRAMS += getversion
-getversion_SOURCES = getversion.c
-
-EXTRA_DIST += linux_dos_attributes/dos_attributes.h
-pkgexec_PROGRAMS += read_dos_attributes write_dos_attributes
-read_dos_attributes_SOURCES = linux_dos_attributes/read_dos_attributes.c
-write_dos_attributes_SOURCES = linux_dos_attributes/write_dos_attributes.c
+scripts_zfs_tests_bin_PROGRAMS += %D%/getversion
+scripts_zfs_tests_bin_PROGRAMS += %D%/user_ns_exec
+scripts_zfs_tests_bin_PROGRAMS += %D%/xattrtest
+scripts_zfs_tests_bin_PROGRAMS += %D%/zed_fd_spill-zedlet
 
-pkgexec_PROGRAMS += randfree_file
-randfree_file_SOURCES = file/randfree_file.c
 
-pkgexec_PROGRAMS += user_ns_exec
-user_ns_exec_SOURCES = user_ns_exec.c
+EXTRA_DIST += $(addprefix %D%/,linux_dos_attributes/dos_attributes.h)
+scripts_zfs_tests_bin_PROGRAMS  += %D%/read_dos_attributes %D%/write_dos_attributes
+%C%_read_dos_attributes_SOURCES  = %D%/linux_dos_attributes/read_dos_attributes.c
+%C%_write_dos_attributes_SOURCES = %D%/linux_dos_attributes/write_dos_attributes.c
 
-pkgexec_PROGRAMS += xattrtest
-xattrtest_SOURCES = xattrtest.c
 
-pkgexec_PROGRAMS += zed_fd_spill-zedlet
-zed_fd_spill_zedlet_SOURCES = zed_fd_spill-zedlet.c
+scripts_zfs_tests_bin_PROGRAMS += %D%/randfree_file
+%C%_randfree_file_SOURCES       = %D%/file/randfree_file.c
 endif
diff --git a/tests/zfs-tests/include/Makefile.am b/tests/zfs-tests/include/Makefile.am
deleted file mode 100644
index b6f723267240..000000000000
--- a/tests/zfs-tests/include/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-CLEANFILES =
-EXTRA_DIST =
-include $(top_srcdir)/config/Substfiles.am
-
-pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/include
-dist_pkgdata_DATA = \
-	blkdev.shlib \
-	commands.cfg \
-	libtest.shlib \
-	math.shlib \
-	properties.shlib \
-	tunables.cfg \
-	zpool_script.shlib
-
-nodist_pkgdata_DATA = default.cfg
-SUBSTFILES += $(nodist_pkgdata_DATA)
diff --git a/tests/zfs-tests/tests/Makefile.am b/tests/zfs-tests/tests/Makefile.am
index f7494791524e..c35143187726 100644
--- a/tests/zfs-tests/tests/Makefile.am
+++ b/tests/zfs-tests/tests/Makefile.am
@@ -1 +1 @@
-SUBDIRS = functional perf stress
+SUBDIRS = functional perf
diff --git a/tests/zfs-tests/tests/functional/Makefile.am b/tests/zfs-tests/tests/functional/Makefile.am
index 9164650e3419..785958816657 100644
--- a/tests/zfs-tests/tests/functional/Makefile.am
+++ b/tests/zfs-tests/tests/functional/Makefile.am
@@ -1,95 +1,94 @@
 SUBDIRS = \
 	acl \
 	alloc_class \
 	arc \
 	atime \
 	bootfs \
 	btree \
 	cache \
 	cachefile \
 	casenorm \
 	channel_program \
 	chattr \
 	checksum \
 	clean_mirror \
 	cli_root \
 	cli_user \
 	compression \
 	cp_files \
 	crtime \
 	ctime \
 	deadman \
 	delegate \
 	devices \
 	dos_attributes \
 	events \
 	exec \
 	fallocate \
 	fault \
 	features \
 	grow \
 	history \
-	hkdf \
 	inheritance \
 	inuse \
 	io \
 	l2arc \
 	large_files \
 	largest_pool \
 	libzfs \
 	limits \
 	link_count \
 	log_spacemap \
 	migration \
 	mmap \
 	mmp \
 	mount \
 	mv_files \
 	nestedfs \
 	no_space \
 	nopwrite \
 	online_offline \
 	pam \
 	pool_checkpoint \
 	pool_names \
 	poolversion \
 	privilege \
 	procfs \
 	projectquota \
 	pyzfs \
 	quota \
 	raidz \
 	redacted_send \
 	redundancy \
 	refquota \
 	refreserv \
 	removal \
 	rename_dirs \
 	replacement \
 	reservation \
 	rootpool \
 	rsend \
 	scrub_mirror \
 	slog \
 	snapshot \
 	snapused \
 	sparse \
 	stat \
 	suid \
 	threadsappend \
 	trim \
 	truncate \
 	upgrade \
 	user_namespace \
 	userquota \
 	vdev_zaps \
 	write_dirs \
 	xattr \
 	zpool_influxdb \
 	zvol
 
 if BUILD_LINUX
 SUBDIRS += \
 	simd \
 	tmpfile
 endif
diff --git a/tests/zfs-tests/tests/functional/hkdf/Makefile.am b/tests/zfs-tests/tests/functional/hkdf/Makefile.am
deleted file mode 100644
index bb8a41f6c0c1..000000000000
--- a/tests/zfs-tests/tests/functional/hkdf/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/config/Rules.am
-
-pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/hkdf
-
-pkgexec_PROGRAMS = hkdf_test
-hkdf_test_SOURCES = hkdf_test.c
-hkdf_test_LDADD = \
-	$(abs_top_builddir)/libzpool.la
diff --git a/tests/zfs-tests/tests/functional/libzfs/Makefile.am b/tests/zfs-tests/tests/functional/libzfs/Makefile.am
index f9cce0c6b280..fb1374255a6a 100644
--- a/tests/zfs-tests/tests/functional/libzfs/Makefile.am
+++ b/tests/zfs-tests/tests/functional/libzfs/Makefile.am
@@ -1,14 +1,6 @@
-include $(top_srcdir)/config/Rules.am
-
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/libzfs
-pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/libzfs
 
 dist_pkgdata_SCRIPTS = \
 	cleanup.ksh \
 	setup.ksh \
 	libzfs_input.ksh
-
-pkgexec_PROGRAMS = many_fds
-many_fds_SOURCES = many_fds.c
-many_fds_LDADD = \
-	$(abs_top_builddir)/libzfs.la
diff --git a/tests/zfs-tests/tests/functional/tmpfile/Makefile.am b/tests/zfs-tests/tests/functional/tmpfile/Makefile.am
index 35a1f44c1693..65b0d64bc53f 100644
--- a/tests/zfs-tests/tests/functional/tmpfile/Makefile.am
+++ b/tests/zfs-tests/tests/functional/tmpfile/Makefile.am
@@ -1,16 +1,5 @@
-include $(top_srcdir)/config/Rules.am
-
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/tmpfile
 
 dist_pkgdata_SCRIPTS = \
 	cleanup.ksh \
 	setup.ksh
-
-pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/tmpfile
-
-pkgexec_PROGRAMS = tmpfile_test tmpfile_001_pos tmpfile_002_pos \
-	tmpfile_003_pos tmpfile_stat_mode
-tmpfile_test_SOURCES= tmpfile_test.c
-tmpfile_001_pos_SOURCES = tmpfile_001_pos.c
-tmpfile_002_pos_SOURCES = tmpfile_002_pos.c
-tmpfile_003_pos_SOURCES = tmpfile_003_pos.c
diff --git a/tests/zfs-tests/tests/stress/Makefile.am b/tests/zfs-tests/tests/stress/Makefile.am
deleted file mode 100644
index 741f85085609..000000000000
--- a/tests/zfs-tests/tests/stress/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS =