diff --git a/tests/zfs-tests/include/Makefile.am b/tests/zfs-tests/include/Makefile.am
index d9e6f4712..a10d6a324 100644
--- a/tests/zfs-tests/include/Makefile.am
+++ b/tests/zfs-tests/include/Makefile.am
@@ -5,6 +5,3 @@ dist_pkgdata_SCRIPTS = \
 	libtest.shlib \
 	math.shlib \
 	properties.shlib
-
-EXTRA_DIST = \
-	zfs_commands.cfg
diff --git a/tests/zfs-tests/include/default.cfg.in b/tests/zfs-tests/include/default.cfg.in
index f6d6de0e9..a36ab3b1a 100644
--- a/tests/zfs-tests/include/default.cfg.in
+++ b/tests/zfs-tests/include/default.cfg.in
@@ -47,8 +47,8 @@ export RAIDZ_TEST=${RAIDZ_TEST:-${bindir}/raidz_test}
 . $STF_SUITE/include/libtest.shlib
 
 # Optionally override the installed ZFS commands to run in-tree
-if [[ -f "$STF_SUITE/include/zfs_commands.cfg" ]]; then
-	. $STF_SUITE/include/zfs_commands.cfg
+if [[ -f "$SRCDIR/zfs-script-config.sh" ]]; then
+	. $SRCDIR/zfs-script-config.sh
 fi
 
 # Define run length constants
diff --git a/tests/zfs-tests/include/zfs_commands.cfg b/tests/zfs-tests/include/zfs_commands.cfg
deleted file mode 120000
index 222b0389e..000000000
--- a/tests/zfs-tests/include/zfs_commands.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../../../zfs-script-config.sh
\ No newline at end of file