diff --git a/tests/runfiles/sanity.run b/tests/runfiles/sanity.run
index ad4495144c..2a9b4adf5f 100644
--- a/tests/runfiles/sanity.run
+++ b/tests/runfiles/sanity.run
@@ -414,7 +414,7 @@ user =
 tags = ['functional', 'cli_user', 'zpool_list']
 
 [tests/functional/compression]
-tests = ['compress_003_pos']
+tests = ['compress_003_pos','compress_zstd_bswap']
 tags = ['functional', 'compression']
 
 [tests/functional/exec]
diff --git a/tests/zfs-tests/tests/functional/compression/Makefile.am b/tests/zfs-tests/tests/functional/compression/Makefile.am
index 92a973258d..817bd41e80 100644
--- a/tests/zfs-tests/tests/functional/compression/Makefile.am
+++ b/tests/zfs-tests/tests/functional/compression/Makefile.am
@@ -6,10 +6,12 @@ dist_pkgdata_SCRIPTS = \
 	compress_002_pos.ksh \
 	compress_003_pos.ksh \
 	compress_004_pos.ksh \
+	compress_zstd_bswap.ksh \
 	l2arc_compressed_arc.ksh \
 	l2arc_compressed_arc_disabled.ksh \
 	l2arc_encrypted.ksh \
 	l2arc_encrypted_no_compressed_arc.ksh
 
 dist_pkgdata_DATA = \
-	compress.cfg
+	compress.cfg \
+	testpool_zstd.tar.gz
diff --git a/tests/zfs-tests/tests/functional/compression/compress_zstd_bswap.ksh b/tests/zfs-tests/tests/functional/compression/compress_zstd_bswap.ksh
new file mode 100755
index 0000000000..9726cf0dd5
--- /dev/null
+++ b/tests/zfs-tests/tests/functional/compression/compress_zstd_bswap.ksh
@@ -0,0 +1,55 @@
+#!/bin/ksh -p
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (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
+#
+
+#
+# Copyright (c) 2007, Sun Microsystems Inc. All rights reserved.
+# Copyright (c) 2021, Rich Ercolani.
+# Use is subject to license terms.
+#
+
+. $STF_SUITE/include/properties.shlib
+. $STF_SUITE/include/libtest.shlib
+
+#
+# DESCRIPTION:
+# Import a pool containing variously-permuted zstd-compressed files,
+# then try to copy them out.
+
+typeset TESTPOOL_ZSTD_FILE=$STF_SUITE/tests/functional/compression/testpool_zstd.tar.gz
+verify_runnable "both"
+
+function cleanup
+{
+	destroy_pool testpool_zstd
+	rm -f $TEST_BASE_DIR/testpool_zstd
+	
+}
+
+log_assert "Trying to read data from variously mangled zstd datasets"
+log_onexit cleanup
+
+log_must tar --directory $TEST_BASE_DIR -xzSf $TESTPOOL_ZSTD_FILE
+log_must zpool import -d $TEST_BASE_DIR testpool_zstd
+log_must dd if=/testpool_zstd/x86_64/zstd of=/dev/null
+log_must dd if=/testpool_zstd/ppc64_fbsd/zstd of=/dev/null
+
+log_pass "Reading from mangled zstd datasets works as expected."
diff --git a/tests/zfs-tests/tests/functional/compression/testpool_zstd.tar.gz b/tests/zfs-tests/tests/functional/compression/testpool_zstd.tar.gz
new file mode 100644
index 0000000000..4096f7fcbe
Binary files /dev/null and b/tests/zfs-tests/tests/functional/compression/testpool_zstd.tar.gz differ