diff --git a/tests/zfs-tests/tests/functional/alloc_class/alloc_class_012_pos.ksh b/tests/zfs-tests/tests/functional/alloc_class/alloc_class_012_pos.ksh
index eeb541f47b2b..b03a8b4c8793 100755
--- a/tests/zfs-tests/tests/functional/alloc_class/alloc_class_012_pos.ksh
+++ b/tests/zfs-tests/tests/functional/alloc_class/alloc_class_012_pos.ksh
@@ -24,7 +24,7 @@
 
 verify_runnable "global"
 
-claim= "Removing a special device from a pool succeeds."
+claim="Removing a special device from a pool succeeds."
 
 log_assert $claim
 log_onexit cleanup
diff --git a/tests/zfs-tests/tests/functional/alloc_class/alloc_class_013_pos.ksh b/tests/zfs-tests/tests/functional/alloc_class/alloc_class_013_pos.ksh
index b817bdacf572..22a8f1a97dc0 100755
--- a/tests/zfs-tests/tests/functional/alloc_class/alloc_class_013_pos.ksh
+++ b/tests/zfs-tests/tests/functional/alloc_class/alloc_class_013_pos.ksh
@@ -24,7 +24,7 @@
 
 verify_runnable "global"
 
-claim= "Removing a dedup device from a pool succeeds."
+claim="Removing a dedup device from a pool succeeds."
 
 log_assert $claim
 log_onexit cleanup
diff --git a/tests/zfs-tests/tests/functional/alloc_class/cleanup.ksh b/tests/zfs-tests/tests/functional/alloc_class/cleanup.ksh
index 6f7e1d61a57a..c12d5973b4e9 100755
--- a/tests/zfs-tests/tests/functional/alloc_class/cleanup.ksh
+++ b/tests/zfs-tests/tests/functional/alloc_class/cleanup.ksh
@@ -21,7 +21,7 @@
 
 verify_runnable "global"
 
-pool_cleanup
+default_cleanup
 disk_cleanup
 
 log_pass
diff --git a/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.exists.ksh b/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.exists.ksh
index e46fe2131589..d486c25f4487 100755
--- a/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.exists.ksh
+++ b/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.exists.ksh
@@ -37,7 +37,7 @@ log_must_program $TESTPOOL $ZCP_ROOT/lua_core/tst.exists.zcp \
     $TESTPOOL $TESTPOOL/$TESTFS $TESTPOOL/$TESTFS@$TESTSNAP \
     $TESTPOOL/$TESTCLONE
 
-log_mustnot_checkerr_program "not in the target pool" \
+log_mustnot_checkerror_program "not in the target pool" \
     $TESTPOOL - <<-EOF
 	return zfs.exists('rpool')
 EOF
diff --git a/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.nvlist_to_lua.ksh b/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.nvlist_to_lua.ksh
index cd7b3c17ae73..eaba6427c96c 100755
--- a/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.nvlist_to_lua.ksh
+++ b/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.nvlist_to_lua.ksh
@@ -14,8 +14,6 @@
 # Copyright (c) 2016 by Delphix. All rights reserved.
 #
 
-verify_runnable "global"
-
 . $STF_SUITE/tests/functional/channel_program/channel_common.kshlib
 
 #
@@ -23,6 +21,8 @@ verify_runnable "global"
 #	run C program which tests passing different nvlists to lua
 #
 
+verify_runnable "global"
+
 log_assert "nvlist arguments can be passed to LUA."
 
 log_must nvlist_to_lua $TESTPOOL
diff --git a/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.return_nvlist_neg.ksh b/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.return_nvlist_neg.ksh
index b5626e549d6d..10afa6727847 100755
--- a/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.return_nvlist_neg.ksh
+++ b/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.return_nvlist_neg.ksh
@@ -14,8 +14,6 @@
 # Copyright (c) 2016 by Delphix. All rights reserved.
 #
 
-verify_runnable "global"
-
 . $STF_SUITE/tests/functional/channel_program/channel_common.kshlib
 
 #
diff --git a/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.return_nvlist_pos.ksh b/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.return_nvlist_pos.ksh
index dce26011321b..8b4ef6e760b0 100755
--- a/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.return_nvlist_pos.ksh
+++ b/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.return_nvlist_pos.ksh
@@ -14,8 +14,6 @@
 # Copyright (c) 2016 by Delphix. All rights reserved.
 #
 
-verify_runnable "global"
-
 . $STF_SUITE/tests/functional/channel_program/channel_common.kshlib
 
 #
diff --git a/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.return_recursive_table.ksh b/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.return_recursive_table.ksh
index 78009dbbe52e..18c035e0464b 100755
--- a/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.return_recursive_table.ksh
+++ b/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.return_recursive_table.ksh
@@ -14,8 +14,6 @@
 # Copyright (c) 2016 by Delphix. All rights reserved.
 #
 
-verify_runnable "global"
-
 . $STF_SUITE/tests/functional/channel_program/channel_common.kshlib
 
 #
diff --git a/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.timeout.ksh b/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.timeout.ksh
index 33274c51d509..9256e86771af 100755
--- a/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.timeout.ksh
+++ b/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.timeout.ksh
@@ -14,8 +14,6 @@
 # Copyright (c) 2016, 2017 by Delphix. All rights reserved.
 #
 
-verify_runnable "global"
-
 . $STF_SUITE/tests/functional/channel_program/channel_common.kshlib
 
 #
diff --git a/tests/zfs-tests/tests/functional/channel_program/synctask_core/tst.destroy_fs.ksh b/tests/zfs-tests/tests/functional/channel_program/synctask_core/tst.destroy_fs.ksh
index 18f246889994..45a3fdb66a6f 100755
--- a/tests/zfs-tests/tests/functional/channel_program/synctask_core/tst.destroy_fs.ksh
+++ b/tests/zfs-tests/tests/functional/channel_program/synctask_core/tst.destroy_fs.ksh
@@ -14,10 +14,10 @@
 # Copyright (c) 2016, 2017 by Delphix. All rights reserved.
 #
 
-verify_runnable "global"
-
 . $STF_SUITE/tests/functional/channel_program/channel_common.kshlib
 
+verify_runnable "global"
+
 fs=$TESTPOOL/$TESTFS/testchild
 
 function cleanup
diff --git a/tests/zfs-tests/tests/functional/channel_program/synctask_core/tst.destroy_snap.ksh b/tests/zfs-tests/tests/functional/channel_program/synctask_core/tst.destroy_snap.ksh
index 8650322ad065..571d7f87c1b5 100755
--- a/tests/zfs-tests/tests/functional/channel_program/synctask_core/tst.destroy_snap.ksh
+++ b/tests/zfs-tests/tests/functional/channel_program/synctask_core/tst.destroy_snap.ksh
@@ -14,10 +14,10 @@
 # Copyright (c) 2016, 2017 by Delphix. All rights reserved.
 #
 
-verify_runnable "global"
-
 . $STF_SUITE/tests/functional/channel_program/channel_common.kshlib
 
+verify_runnable "global"
+
 snap=$TESTPOOL/$TESTFS@$TESTSNAP
 
 function cleanup
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_import/import_cachefile_shared_device.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_import/import_cachefile_shared_device.ksh
index 750857419074..23d79c69075e 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_import/import_cachefile_shared_device.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/import_cachefile_shared_device.ksh
@@ -90,7 +90,7 @@ function test_shared_device
 	typeset checksum2=$(dev_checksum $sharedvdev)
 
 	if [[ $checksum1 == $checksum2 ]]; then
-		log_pos "Device hasn't been modified by original pool"
+		log_pass "Device hasn't been modified by original pool"
 	else
 		log_fail "Device has been modified by original pool." \
 		    "Checksum mismatch: $checksum1 != $checksum2."
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 1ef25e4dc5b2..bcf6a2296d57 100755
--- a/tests/zfs-tests/tests/functional/cli_user/misc/setup.ksh
+++ b/tests/zfs-tests/tests/functional/cli_user/misc/setup.ksh
@@ -55,7 +55,7 @@ default_setup_noexit "$DISK" "" "volume"
 log_must zfs snapshot $TESTPOOL/$TESTFS@snap
 log_must zfs clone $TESTPOOL/$TESTFS@snap $TESTPOOL/$TESTFS/clone
 # create a file in the filesystem that isn't in the above snapshot
-touch /$TESTDIR/file.txt
+touch $TESTDIR/file.txt
 
 
 # create a non-default property and a child we can use to test inherit
@@ -116,28 +116,28 @@ then
 
 	# Now create several virtual disks to test zpool with
 
-	mkfile $MINVDEVSIZE /$TESTDIR/disk1.dat
-	mkfile $MINVDEVSIZE /$TESTDIR/disk2.dat
-	mkfile $MINVDEVSIZE /$TESTDIR/disk3.dat
-	mkfile $MINVDEVSIZE /$TESTDIR/disk-additional.dat
-	mkfile $MINVDEVSIZE /$TESTDIR/disk-export.dat
-	mkfile $MINVDEVSIZE /$TESTDIR/disk-offline.dat
-	mkfile $MINVDEVSIZE /$TESTDIR/disk-spare1.dat
-	mkfile $MINVDEVSIZE /$TESTDIR/disk-spare2.dat
+	mkfile $MINVDEVSIZE $TEST_BASE_DIR/disk1.dat
+	mkfile $MINVDEVSIZE $TEST_BASE_DIR/disk2.dat
+	mkfile $MINVDEVSIZE $TEST_BASE_DIR/disk3.dat
+	mkfile $MINVDEVSIZE $TEST_BASE_DIR/disk-additional.dat
+	mkfile $MINVDEVSIZE $TEST_BASE_DIR/disk-export.dat
+	mkfile $MINVDEVSIZE $TEST_BASE_DIR/disk-offline.dat
+	mkfile $MINVDEVSIZE $TEST_BASE_DIR/disk-spare1.dat
+	mkfile $MINVDEVSIZE $TEST_BASE_DIR/disk-spare2.dat
 
 	# and create a pool we can perform attach remove replace,
 	# etc. operations with
-	log_must zpool create $TESTPOOL.virt mirror /$TESTDIR/disk1.dat \
-	/$TESTDIR/disk2.dat /$TESTDIR/disk3.dat /$TESTDIR/disk-offline.dat \
-	spare /$TESTDIR/disk-spare1.dat
+	log_must zpool create $TESTPOOL.virt mirror $TEST_BASE_DIR/disk1.dat \
+	$TEST_BASE_DIR/disk2.dat $TEST_BASE_DIR/disk3.dat \
+	$TEST_BASE_DIR/disk-offline.dat spare $TEST_BASE_DIR/disk-spare1.dat
 
 
 	# Offline one of the disks to test online
-	log_must zpool offline $TESTPOOL.virt /$TESTDIR/disk-offline.dat
+	log_must zpool offline $TESTPOOL.virt $TEST_BASE_DIR/disk-offline.dat
 
 
 	# create an exported pool to test import
-	log_must zpool create $TESTPOOL.exported /$TESTDIR/disk-export.dat
+	log_must zpool create $TESTPOOL.exported $TEST_BASE_DIR/disk-export.dat
 	log_must zpool export $TESTPOOL.exported
 
 	set -A props $POOL_PROPS
@@ -154,8 +154,8 @@ then
 
 	# copy a v1 pool from cli_root
 	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
+	    $TEST_BASE_DIR/
+	log_must bunzip2 $TEST_BASE_DIR/zfs-pool-v1.dat.bz2
+	log_must zpool import -d $TEST_BASE_DIR/ v1-pool
 fi
 log_pass
diff --git a/tests/zfs-tests/tests/functional/cli_user/misc/zpool_upgrade_001_neg.ksh b/tests/zfs-tests/tests/functional/cli_user/misc/zpool_upgrade_001_neg.ksh
index f058bf5c6e45..aa380010574f 100755
--- a/tests/zfs-tests/tests/functional/cli_user/misc/zpool_upgrade_001_neg.ksh
+++ b/tests/zfs-tests/tests/functional/cli_user/misc/zpool_upgrade_001_neg.ksh
@@ -47,7 +47,6 @@ verify_runnable "global"
 
 log_assert "zpool upgrade returns an error when run as a user"
 
-log_onexit cleanup
 # zpool upgrade returns 0 when it can't do anything
 log_must zpool upgrade $TESTPOOL.virt