diff --git a/tests/zfs-tests/cmd/btree_test/.gitignore b/tests/zfs-tests/cmd/btree_test/.gitignore
new file mode 100644
index 000000000000..73777c4c1f4b
--- /dev/null
+++ b/tests/zfs-tests/cmd/btree_test/.gitignore
@@ -0,0 +1 @@
+/btree_test
diff --git a/tests/zfs-tests/tests/functional/features/large_dnode/large_dnode_008_pos.ksh b/tests/zfs-tests/tests/functional/features/large_dnode/large_dnode_008_pos.ksh
index eac292cbe064..71e175171322 100755
--- a/tests/zfs-tests/tests/functional/features/large_dnode/large_dnode_008_pos.ksh
+++ b/tests/zfs-tests/tests/functional/features/large_dnode/large_dnode_008_pos.ksh
@@ -39,7 +39,7 @@ verify_runnable "both"
 
 function cleanup
 {
-	datasetexists $TEST_FS && log_must zfs destroy $TEST_FS
+	datasetexists $TEST_FS && destroy_dataset $TEST_FS
 }
 
 function verify_dnode_packing
@@ -71,6 +71,7 @@ for ((i=0; i < 100; i++)); do
 done
 
 log_must wait
+sync_pool $TESTPOOL
 
 verify_dnode_packing
 
diff --git a/tests/zfs-tests/tests/functional/refreserv/refreserv_raidz.ksh b/tests/zfs-tests/tests/functional/refreserv/refreserv_raidz.ksh
index 7b1f84afe251..9f25242de607 100755
--- a/tests/zfs-tests/tests/functional/refreserv/refreserv_raidz.ksh
+++ b/tests/zfs-tests/tests/functional/refreserv/refreserv_raidz.ksh
@@ -121,6 +121,7 @@ for parity in 1 2 3; do
 			log_must test "$deltapct" -le $maxpct
 
 			log_must_busy zfs destroy "$vol"
+			block_device_wait
 		done
 
 		log_must_busy zpool destroy "$TESTPOOL"