diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_all_fail.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_all_fail.ksh
index d1103bddccbd..7b6c2ccdf660 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_all_fail.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_all_fail.ksh
@@ -16,6 +16,7 @@
 
 #
 # Copyright (c) 2017 by Delphix. All rights reserved.
+# Copyright 2024 MNX Cloud, Inc.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -44,8 +45,9 @@ typeset fscount=10
 function setup_all
 {
 	# Create $fscount filesystems at the top level of $path
-	for ((i=0; i<$fscount; i++)); do
+	for ((i=0; i<fscount; i++)); do
 		setup_filesystem "$DISKS" "$TESTPOOL" $i "$path/$i" ctr
+		filesystems+=($i)
 	done
 
 	zfs list -r $TESTPOOL
@@ -58,6 +60,12 @@ function cleanup_all
 	export __ZFS_POOL_RESTRICT="$TESTPOOL"
 	log_must zfs $unmountall
 	unset __ZFS_POOL_RESTRICT
+	# make sure we leave $TESTPOOL mounted
+	log_must zfs mount $TESTPOOL
+
+	for fs in ${filesystems[@]}; do
+		cleanup_filesystem "$TESTPOOL" "$fs"
+	done
 
 	[[ -d ${TEST_BASE_DIR%%/}/testroot$$ ]] && \
 		rm -rf ${TEST_BASE_DIR%%/}/testroot$$
@@ -76,7 +84,7 @@ log_must zfs $unmountall
 unset __ZFS_POOL_RESTRICT
 
 # All of our filesystems should be unmounted at this point
-for ((i=0; i<$fscount; i++)); do
+for ((i=0; i<fscount; i++)); do
 	log_mustnot mounted "$TESTPOOL/$i"
 done
 
@@ -98,7 +106,7 @@ log_mustnot mounted "$TESTPOOL/0"
 unset __ZFS_POOL_RESTRICT
 
 # All other filesystems should be mounted
-for ((i=1; i<$fscount; i++)); do
+for ((i=1; i<fscount; i++)); do
 	log_must mounted "$TESTPOOL/$i"
 done