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 2ce22a624291..790a47f26576 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
@@ -1,63 +1,64 @@
 #!/bin/ksh -p
 
 #
 # This file and its contents are supplied under the terms of the
 # Common Development and Distribution License ("CDDL"), version 1.0.
 # You may only use this file in accordance with the terms of version
 # 1.0 of the CDDL.
 #
 # A full copy of the text of the CDDL should have accompanied this
 # source.  A copy of the CDDL is also available via the Internet at
 # http://www.illumos.org/license/CDDL.
 #
 
 #
 # Copyright (c) 2018 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/alloc_class/alloc_class.kshlib
 
 #
 # DESCRIPTION:
 #	Removing a dedup device from a pool succeeds.
 #
 
 verify_runnable "global"
 
 claim="Removing a dedup device from a pool succeeds."
 
 log_assert $claim
 log_onexit cleanup
 
 #
 # Create a non-raidz pool so we can remove top-level vdevs
 #
 log_must disk_setup
 log_must zpool create $TESTPOOL $ZPOOL_DISKS dedup $CLASS_DISK0
 log_must display_status "$TESTPOOL"
 
 #
 # Generate some dedup data in the dedup class before removal
 #
 
 log_must zfs create -o dedup=on -V 2G $TESTPOOL/$TESTVOL
 
-log_must eval "new_fs $ZVOL_DEVDIR/$TESTPOOL/$TESTVOL >/dev/null 2>&1"
+block_device_wait "$ZVOL_DEVDIR/$TESTPOOL/$TESTVOL"
+log_must eval "new_fs $ZVOL_DEVDIR/$TESTPOOL/$TESTVOL >/dev/null"
 
 sync_pool
 log_must zpool list -v $TESTPOOL
 
 #
 # remove a dedup allocation vdev
 #
 log_must zpool remove $TESTPOOL $CLASS_DISK0
 
 sleep 5
 log_must sync_pool $TESTPOOL
 sleep 1
 
 log_must zdb -bbcc $TESTPOOL
 
 log_must zpool destroy -f "$TESTPOOL"
 
 log_pass $claim
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_start_and_cancel_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_start_and_cancel_pos.ksh
index fbb0c291046c..19781137d3ca 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_start_and_cancel_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_start_and_cancel_pos.ksh
@@ -1,48 +1,48 @@
 #!/bin/ksh -p
 #
 # CDDL HEADER START
 #
 # This file and its contents are supplied under the terms of the
 # Common Development and Distribution License ("CDDL"), version 1.0.
 # You may only use this file in accordance with the terms of version
 # 1.0 of the CDDL.
 #
 # A full copy of the text of the CDDL should have accompanied this
 # source.  A copy of the CDDL is also available via the Internet at
 # http://www.illumos.org/license/CDDL.
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright (c) 2019 by Tim Chase. All rights reserved.
 # Copyright (c) 2019 Lawrence Livermore National Security, LLC.
 #
 
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zpool_trim/zpool_trim.kshlib
 
 #
 # DESCRIPTION:
 # Starting and stopping a trim works.
 #
 # STRATEGY:
 # 1. Create a one-disk pool.
 # 2. Start trimming and verify that trimming is active.
 # 3. Cancel trimming and verify that trimming is not active.
 #
 
 DISK1=${DISKS%% *}
 
 log_must zpool create -f $TESTPOOL $DISK1
-log_must zpool trim $TESTPOOL
+log_must zpool trim -r 1 $TESTPOOL
 
 [[ -z "$(trim_progress $TESTPOOL $DISK1)" ]] && \
     log_fail "TRIM did not start"
 
 log_must zpool trim -c $TESTPOOL
 
 [[ -z "$(trim_progress $TESTPOOL $DISK1)" ]] || \
     log_fail "TRIM did not stop"
 
 log_pass "TRIM start + cancel works"