diff --git a/tests/zfs-tests/include/libtest.shlib b/tests/zfs-tests/include/libtest.shlib
index 0ab0045391..3c0cd04c5e 100644
--- a/tests/zfs-tests/include/libtest.shlib
+++ b/tests/zfs-tests/include/libtest.shlib
@@ -545,11 +545,18 @@ function destroy_mirrors
 	log_pass
 }
 
+function default_raidz_setup
+{
+	default_raidz_setup_noexit "$*"
+
+	log_pass
+}
+
 #
 # Given a minimum of two disks, set up a storage pool and dataset for the raid-z
 # $1 the list of disks
 #
-function default_raidz_setup
+function default_raidz_setup_noexit
 {
 	typeset disklist="$*"
 	disks=(${disklist[*]})
@@ -562,8 +569,6 @@ function default_raidz_setup
 	log_must zpool create -f $TESTPOOL raidz $disklist
 	log_must zfs create $TESTPOOL/$TESTFS
 	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
-
-	log_pass
 }
 
 #
diff --git a/tests/zfs-tests/tests/functional/online_offline/setup.ksh b/tests/zfs-tests/tests/functional/online_offline/setup.ksh
index 4132392d80..b1fb6a1238 100755
--- a/tests/zfs-tests/tests/functional/online_offline/setup.ksh
+++ b/tests/zfs-tests/tests/functional/online_offline/setup.ksh
@@ -43,5 +43,3 @@ case $index in
 	default_raidz_setup $DISKS
 	;;
 esac
-
-log_pass
diff --git a/tests/zfs-tests/tests/functional/replacement/setup.ksh b/tests/zfs-tests/tests/functional/replacement/setup.ksh
index 4132392d80..b1fb6a1238 100755
--- a/tests/zfs-tests/tests/functional/replacement/setup.ksh
+++ b/tests/zfs-tests/tests/functional/replacement/setup.ksh
@@ -43,5 +43,3 @@ case $index in
 	default_raidz_setup $DISKS
 	;;
 esac
-
-log_pass