Use posix format for dist tarballs

Traditionally Automake has defaulted to the V7 tar format when
creating tarballs for distributions.  One of the many limitions
of this format is a 99 character maximum path + file name limit.
This can cause problems when adding new test cases to the ZTS
due to the depth of the sub-tree and descriptive test names.

This change switches the build system to the posix (aliased as
pax) tar format which conforms to the POSIX.1-2001 specification.
This format does not suffer from the V7 limitations, was designed
to be compatible, and will become the default format in future
versions of GNU tar.

https://www.gnu.org/software/tar/manual/html_chapter/tar_8.html

As part of this change the blockfiles directories which were
originally removed due to this limit have been readded.

Reviewed by: Tim Chase <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #7767 

65 files changed, 75 insertions, 71 deletions

diff --git a/configure.ac b/configure.ac
index 9a67472bf..5a308976c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,6 +51,7 @@ AC_PROG_LIBTOOL
 AM_PROG_AS
 AM_PROG_CC_C_O
 AX_CODE_COVERAGE
+_AM_PROG_TAR(pax)
 
 ZFS_AC_LICENSE
 ZFS_AC_PACKAGE
@@ -242,6 +243,7 @@ AC_CONFIG_FILES([
 	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_labelclear/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool/Makefile
 	tests/zfs-tests/tests/functional/cli_root/zpool_offline/Makefile
@@ -255,6 +257,7 @@ AC_CONFIG_FILES([
 	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_upgrade/Makefile
+	tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/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
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_005_neg.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_005_neg.ksh
index 9e5a5c661..6a8b81ac5 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_005_neg.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_005_neg.ksh
@@ -61,7 +61,7 @@ function cleanup
 log_assert "Verify that copies cannot be set with pool version 1"
 log_onexit cleanup
 
-log_must cp $STF_SUITE/tests/functional/cli_root/zpool_upgrade/$ZPOOL_VERSION_1_FILES $TEST_BASE_DIR
+log_must cp $STF_SUITE/tests/functional/cli_root/zpool_upgrade/blockfiles/$ZPOOL_VERSION_1_FILES $TEST_BASE_DIR
 log_must bunzip2 $TEST_BASE_DIR/$ZPOOL_VERSION_1_FILES
 log_must zpool import -d $TEST_BASE_DIR $ZPOOL_VERSION_1_NAME
 log_must zfs create $ZPOOL_VERSION_1_NAME/$TESTFS
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_009_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_009_pos.ksh
index 12914f778..4cd98af0c 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_009_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_009_pos.ksh
@@ -55,7 +55,7 @@ valid_args=("$TESTPOOL/$TESTFS1@snap $TESTPOOL/$TESTFS2@snap \
 log_assert "verify zfs supports multiple consistent snapshots"
 log_onexit cleanup
 typeset -i i=1
-test_data=$STF_SUITE/tests/functional/cli_root/zpool_upgrade/*.bz2
+test_data=$STF_SUITE/tests/functional/cli_root/zpool_upgrade/blockfiles/*.bz2
 
 log_note "destroy a list of valid snapshots"
 for ds in $datasets; do
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_import/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_import/Makefile.am
index 97a15a20d..585f10a0b 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_import/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/Makefile.am
@@ -1,8 +1,9 @@
+SUBDIRS = blockfiles
+
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_import
 dist_pkgdata_SCRIPTS = \
 	setup.ksh \
 	cleanup.ksh \
-	zpool_import.kshlib \
 	import_cache_device_added.ksh \
 	import_cache_device_removed.ksh \
 	import_cache_device_replaced.ksh \
@@ -40,11 +41,7 @@ dist_pkgdata_SCRIPTS = \
 	zpool_import_encrypted_load.ksh \
 	zpool_import_errata3.ksh
 
-BLOCKFILES = \
-	unclean_export.dat.bz2 \
-	cryptv0.dat.bz2
-
-dist_pkgdata_DATA = $(BLOCKFILES) \
-	zpool_import.cfg
+dist_pkgdata_DATA = \
+	zpool_import.cfg \
+	zpool_import.kshlib
 
-EXTRA_DIST = $(BLOCKFILES)
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_import/blockfiles/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_import/blockfiles/Makefile.am
new file mode 100644
index 000000000..74ae60979
--- /dev/null
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/blockfiles/Makefile.am
@@ -0,0 +1,4 @@
+pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_import/blockfiles
+dist_pkgdata_DATA = \
+	unclean_export.dat.bz2 \
+	cryptv0.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_import/cryptv0.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_import/blockfiles/cryptv0.dat.bz2
index 1c625c2c4..1c625c2c4 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_import/cryptv0.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/blockfiles/cryptv0.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_import/unclean_export.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_import/blockfiles/unclean_export.dat.bz2
index a7e042b52..a7e042b52 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_import/unclean_export.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/blockfiles/unclean_export.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_013_neg.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_013_neg.ksh
index c2863e416..0a221b8e0 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_013_neg.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_013_neg.ksh
@@ -53,7 +53,7 @@ function uncompress_pool
 
 	log_note "Creating pool from $POOL_FILE"
 	log_must bzcat \
-	    $STF_SUITE/tests/functional/cli_root/zpool_import/$POOL_FILE.bz2 \
+	    $STF_SUITE/tests/functional/cli_root/zpool_import/blockfiles/$POOL_FILE.bz2 \
 	    > /$TESTPOOL/$POOL_FILE
 	return 0
 }
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_errata3.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_errata3.ksh
index 67e4caee8..f4d97f147 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_errata3.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_errata3.ksh
@@ -45,7 +45,7 @@ function uncompress_pool
 {
 	log_note "Creating pool from $POOL_FILE"
 	log_must bzcat \
-	    $STF_SUITE/tests/functional/cli_root/zpool_import/$POOL_FILE.bz2 \
+	    $STF_SUITE/tests/functional/cli_root/zpool_import/blockfiles/$POOL_FILE.bz2 \
 	    > /$TESTPOOL/$POOL_FILE
 	return 0
 }
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile.am
index 1b08f4879..18311ed2c 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = blockfiles
+
 pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_upgrade
 dist_pkgdata_SCRIPTS = \
 	setup.ksh \
@@ -12,62 +14,6 @@ dist_pkgdata_SCRIPTS = \
 	zpool_upgrade_008_pos.ksh \
 	zpool_upgrade_009_neg.ksh
 
-BLOCKFILES = \
-	zfs-broken-mirror1.dat.bz2 \
-	zfs-broken-mirror2.dat.bz2 \
-	zfs-pool-v1.dat.bz2 \
-	zfs-pool-v10.dat.bz2 \
-	zfs-pool-v11.dat.bz2 \
-	zfs-pool-v12.dat.bz2 \
-	zfs-pool-v13.dat.bz2 \
-	zfs-pool-v14.dat.bz2 \
-	zfs-pool-v15.dat.bz2 \
-	zfs-pool-v1mirror1.dat.bz2 \
-	zfs-pool-v1mirror2.dat.bz2 \
-	zfs-pool-v1mirror3.dat.bz2 \
-	zfs-pool-v1raidz1.dat.bz2 \
-	zfs-pool-v1raidz2.dat.bz2 \
-	zfs-pool-v1raidz3.dat.bz2 \
-	zfs-pool-v1stripe1.dat.bz2 \
-	zfs-pool-v1stripe2.dat.bz2 \
-	zfs-pool-v1stripe3.dat.bz2 \
-	zfs-pool-v2.dat.bz2 \
-	zfs-pool-v2mirror1.dat.bz2 \
-	zfs-pool-v2mirror2.dat.bz2 \
-	zfs-pool-v2mirror3.dat.bz2 \
-	zfs-pool-v2raidz1.dat.bz2 \
-	zfs-pool-v2raidz2.dat.bz2 \
-	zfs-pool-v2raidz3.dat.bz2 \
-	zfs-pool-v2stripe1.dat.bz2 \
-	zfs-pool-v2stripe2.dat.bz2 \
-	zfs-pool-v2stripe3.dat.bz2 \
-	zfs-pool-v3.dat.bz2 \
-	zfs-pool-v3hotspare1.dat.bz2 \
-	zfs-pool-v3hotspare2.dat.bz2 \
-	zfs-pool-v3hotspare3.dat.bz2 \
-	zfs-pool-v3mirror1.dat.bz2 \
-	zfs-pool-v3mirror2.dat.bz2 \
-	zfs-pool-v3mirror3.dat.bz2 \
-	zfs-pool-v3raidz1.dat.bz2 \
-	zfs-pool-v3raidz2.dat.bz2 \
-	zfs-pool-v3raidz21.dat.bz2 \
-	zfs-pool-v3raidz22.dat.bz2 \
-	zfs-pool-v3raidz23.dat.bz2 \
-	zfs-pool-v3raidz3.dat.bz2 \
-	zfs-pool-v3stripe1.dat.bz2 \
-	zfs-pool-v3stripe2.dat.bz2 \
-	zfs-pool-v3stripe3.dat.bz2 \
-	zfs-pool-v4.dat.bz2 \
-	zfs-pool-v5.dat.bz2 \
-	zfs-pool-v6.dat.bz2 \
-	zfs-pool-v7.dat.bz2 \
-	zfs-pool-v8.dat.bz2 \
-	zfs-pool-v9.dat.bz2 \
-	zfs-pool-v999.dat.bz2 \
-	zfs-pool-vBROKEN.dat.bz2
-
-dist_pkgdata_DATA = $(BLOCKFILES) \
+dist_pkgdata_DATA = \
 	zpool_upgrade.cfg \
 	zpool_upgrade.kshlib
-
-EXTRA_DIST = $(BLOCKFILES)
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/Makefile.am
new file mode 100644
index 000000000..ce8da278e
--- /dev/null
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/Makefile.am
@@ -0,0 +1,54 @@
+pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles
+dist_pkgdata_DATA = \
+	zfs-broken-mirror1.dat.bz2 \
+	zfs-broken-mirror2.dat.bz2 \
+	zfs-pool-v1.dat.bz2 \
+	zfs-pool-v10.dat.bz2 \
+	zfs-pool-v11.dat.bz2 \
+	zfs-pool-v12.dat.bz2 \
+	zfs-pool-v13.dat.bz2 \
+	zfs-pool-v14.dat.bz2 \
+	zfs-pool-v15.dat.bz2 \
+	zfs-pool-v1mirror1.dat.bz2 \
+	zfs-pool-v1mirror2.dat.bz2 \
+	zfs-pool-v1mirror3.dat.bz2 \
+	zfs-pool-v1raidz1.dat.bz2 \
+	zfs-pool-v1raidz2.dat.bz2 \
+	zfs-pool-v1raidz3.dat.bz2 \
+	zfs-pool-v1stripe1.dat.bz2 \
+	zfs-pool-v1stripe2.dat.bz2 \
+	zfs-pool-v1stripe3.dat.bz2 \
+	zfs-pool-v2.dat.bz2 \
+	zfs-pool-v2mirror1.dat.bz2 \
+	zfs-pool-v2mirror2.dat.bz2 \
+	zfs-pool-v2mirror3.dat.bz2 \
+	zfs-pool-v2raidz1.dat.bz2 \
+	zfs-pool-v2raidz2.dat.bz2 \
+	zfs-pool-v2raidz3.dat.bz2 \
+	zfs-pool-v2stripe1.dat.bz2 \
+	zfs-pool-v2stripe2.dat.bz2 \
+	zfs-pool-v2stripe3.dat.bz2 \
+	zfs-pool-v3.dat.bz2 \
+	zfs-pool-v3hotspare1.dat.bz2 \
+	zfs-pool-v3hotspare2.dat.bz2 \
+	zfs-pool-v3hotspare3.dat.bz2 \
+	zfs-pool-v3mirror1.dat.bz2 \
+	zfs-pool-v3mirror2.dat.bz2 \
+	zfs-pool-v3mirror3.dat.bz2 \
+	zfs-pool-v3raidz1.dat.bz2 \
+	zfs-pool-v3raidz2.dat.bz2 \
+	zfs-pool-v3raidz21.dat.bz2 \
+	zfs-pool-v3raidz22.dat.bz2 \
+	zfs-pool-v3raidz23.dat.bz2 \
+	zfs-pool-v3raidz3.dat.bz2 \
+	zfs-pool-v3stripe1.dat.bz2 \
+	zfs-pool-v3stripe2.dat.bz2 \
+	zfs-pool-v3stripe3.dat.bz2 \
+	zfs-pool-v4.dat.bz2 \
+	zfs-pool-v5.dat.bz2 \
+	zfs-pool-v6.dat.bz2 \
+	zfs-pool-v7.dat.bz2 \
+	zfs-pool-v8.dat.bz2 \
+	zfs-pool-v9.dat.bz2 \
+	zfs-pool-v999.dat.bz2 \
+	zfs-pool-vBROKEN.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-broken-mirror1.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-broken-mirror1.dat.bz2
index 7ec82b755..7ec82b755 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-broken-mirror1.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-broken-mirror1.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-broken-mirror2.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-broken-mirror2.dat.bz2
index 00ef2bc36..00ef2bc36 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-broken-mirror2.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-broken-mirror2.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v1.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1.dat.bz2
index 9c8a157ee..9c8a157ee 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v1.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v10.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v10.dat.bz2
index 5caf41c42..5caf41c42 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v10.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v10.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v11.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v11.dat.bz2
index 4af228e73..4af228e73 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v11.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v11.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v12.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v12.dat.bz2
index a116e9db6..a116e9db6 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v12.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v12.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v13.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v13.dat.bz2
index 3fab2262b..3fab2262b 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v13.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v13.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v14.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v14.dat.bz2
index e8443c375..e8443c375 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v14.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v14.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v15.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v15.dat.bz2
index 0887ae814..0887ae814 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v15.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v15.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v1mirror1.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1mirror1.dat.bz2
index ed42283eb..ed42283eb 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v1mirror1.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1mirror1.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v1mirror2.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1mirror2.dat.bz2
index 4e72f1acf..4e72f1acf 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v1mirror2.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1mirror2.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v1mirror3.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1mirror3.dat.bz2
index 006c96df7..006c96df7 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v1mirror3.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1mirror3.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v1raidz1.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1raidz1.dat.bz2
index 3c3531c70..3c3531c70 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v1raidz1.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1raidz1.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v1raidz2.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1raidz2.dat.bz2
index 99a0768b0..99a0768b0 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v1raidz2.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1raidz2.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v1raidz3.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1raidz3.dat.bz2
index 0fd057ecb..0fd057ecb 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v1raidz3.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1raidz3.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v1stripe1.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1stripe1.dat.bz2
index 41f63f668..41f63f668 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v1stripe1.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1stripe1.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v1stripe2.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1stripe2.dat.bz2
index cc9eab160..cc9eab160 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v1stripe2.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1stripe2.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v1stripe3.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1stripe3.dat.bz2
index 866bd96c9..866bd96c9 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v1stripe3.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1stripe3.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v2.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v2.dat.bz2
index 184e3c378..184e3c378 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v2.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v2.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v2mirror1.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v2mirror1.dat.bz2
index 7466e7e25..7466e7e25 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v2mirror1.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v2mirror1.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v2mirror2.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v2mirror2.dat.bz2
index de66b539b..de66b539b 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v2mirror2.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v2mirror2.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v2mirror3.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v2mirror3.dat.bz2
index 4c3504b84..4c3504b84 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v2mirror3.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v2mirror3.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v2raidz1.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v2raidz1.dat.bz2
index e008ae099..e008ae099 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v2raidz1.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v2raidz1.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v2raidz2.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v2raidz2.dat.bz2
index bf7f6b119..bf7f6b119 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v2raidz2.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v2raidz2.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v2raidz3.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v2raidz3.dat.bz2
index f7b701269..f7b701269 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v2raidz3.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v2raidz3.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v2stripe1.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v2stripe1.dat.bz2
index 16a7bb89d..16a7bb89d 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v2stripe1.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v2stripe1.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v2stripe2.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v2stripe2.dat.bz2
index 8f7287ee7..8f7287ee7 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v2stripe2.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v2stripe2.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v2stripe3.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v2stripe3.dat.bz2
index 9fccd05c5..9fccd05c5 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v2stripe3.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v2stripe3.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3.dat.bz2
index fc122d8b8..fc122d8b8 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3hotspare1.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3hotspare1.dat.bz2
index d5c7e3c8b..d5c7e3c8b 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3hotspare1.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3hotspare1.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3hotspare2.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3hotspare2.dat.bz2
index 47b4d6a2e..47b4d6a2e 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3hotspare2.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3hotspare2.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3hotspare3.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3hotspare3.dat.bz2
index cb253c308..cb253c308 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3hotspare3.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3hotspare3.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3mirror1.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3mirror1.dat.bz2
index e8ab50c45..e8ab50c45 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3mirror1.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3mirror1.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3mirror2.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3mirror2.dat.bz2
index 769e0f81a..769e0f81a 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3mirror2.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3mirror2.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3mirror3.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3mirror3.dat.bz2
index e7e5a8958..e7e5a8958 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3mirror3.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3mirror3.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3raidz1.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3raidz1.dat.bz2
index 6d43f74ba..6d43f74ba 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3raidz1.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3raidz1.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3raidz2.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3raidz2.dat.bz2
index 6ab1059d0..6ab1059d0 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3raidz2.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3raidz2.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3raidz21.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3raidz21.dat.bz2
index dcc537f15..dcc537f15 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3raidz21.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3raidz21.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3raidz22.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3raidz22.dat.bz2
index 3cd92b173..3cd92b173 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3raidz22.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3raidz22.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3raidz23.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3raidz23.dat.bz2
index e3c5f41f9..e3c5f41f9 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3raidz23.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3raidz23.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3raidz3.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3raidz3.dat.bz2
index 2109fda71..2109fda71 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3raidz3.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3raidz3.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3stripe1.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3stripe1.dat.bz2
index 4e6afe22b..4e6afe22b 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3stripe1.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3stripe1.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3stripe2.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3stripe2.dat.bz2
index 6e755dd83..6e755dd83 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3stripe2.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3stripe2.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3stripe3.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3stripe3.dat.bz2
index 9cf396a3c..9cf396a3c 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v3stripe3.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v3stripe3.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v4.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v4.dat.bz2
index b1c00e168..b1c00e168 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v4.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v4.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v5.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v5.dat.bz2
index 9c6cb0c73..9c6cb0c73 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v5.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v5.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v6.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v6.dat.bz2
index 1eb1fea9d..1eb1fea9d 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v6.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v6.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v7.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v7.dat.bz2
index 04c6cac75..04c6cac75 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v7.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v7.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v8.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v8.dat.bz2
index 8f1e66303..8f1e66303 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v8.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v8.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v9.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v9.dat.bz2
index 94528d373..94528d373 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v9.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v9.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v999.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v999.dat.bz2
index 7ca57a249..7ca57a249 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-v999.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v999.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-vBROKEN.dat.bz2 b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-vBROKEN.dat.bz2
index 6595f4a5d..6595f4a5d 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zfs-pool-vBROKEN.dat.bz2
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-vBROKEN.dat.bz2
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade.kshlib b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade.kshlib
index 238d4ae38..7b018da1b 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade.kshlib
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade.kshlib
@@ -49,7 +49,7 @@ function create_old_pool
 	log_note "Creating $pool_name from $pool_files"
 	for pool_file in $pool_files; do
 		log_must bzcat \
-		    $STF_SUITE/tests/functional/cli_root/zpool_upgrade/$pool_file.bz2 \
+		    $STF_SUITE/tests/functional/cli_root/zpool_upgrade/blockfiles/$pool_file.bz2 \
 		    >$TEST_BASE_DIR/$pool_file
 	done
 	log_must zpool import -d $TEST_BASE_DIR $pool_name
diff --git a/tests/zfs-tests/tests/functional/cli_user/misc/setup.ksh b/tests/zfs-tests/tests/functional/cli_user/misc/setup.ksh
index 0d4a9a681..690d22209 100755
--- a/tests/zfs-tests/tests/functional/cli_user/misc/setup.ksh
+++ b/tests/zfs-tests/tests/functional/cli_user/misc/setup.ksh
@@ -153,7 +153,7 @@ then
 	done
 
 	# copy a v1 pool from cli_root
-	cp $STF_SUITE/tests/functional/cli_root/zpool_upgrade/zfs-pool-v1.dat.bz2 \
+	cp $STF_SUITE/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1.dat.bz2 \
 	    /$TESTDIR
 	log_must bunzip2 /$TESTDIR/zfs-pool-v1.dat.bz2
 	log_must zpool import -d /$TESTDIR v1-pool