diff --git a/tests/fsck-tests/006-bad-root-items/test.sh b/tests/fsck-tests/006-bad-root-items/test.sh
index 421e2258..84332348 100755
--- a/tests/fsck-tests/006-bad-root-items/test.sh
+++ b/tests/fsck-tests/006-bad-root-items/test.sh
@@ -2,6 +2,8 @@
 
 source $TOP/tests/common
 
+check_prereq btrfs
+
 echo "extracting image default_case.tar.xz" >> $RESULTS
 tar --no-same-owner -xJf default_case.tar.xz || \
 	_fail "failed to extract default_case.tar.xz"
diff --git a/tests/fsck-tests/012-leaf-corruption/test.sh b/tests/fsck-tests/012-leaf-corruption/test.sh
index 830fd8d5..a308727d 100755
--- a/tests/fsck-tests/012-leaf-corruption/test.sh
+++ b/tests/fsck-tests/012-leaf-corruption/test.sh
@@ -2,6 +2,8 @@
 
 source $TOP/tests/common
 
+check_prereq btrfs-image
+
 # Check file list for leaf corruption, no regular/preallocated
 # file extent case.
 # Corrupted leaf is 20832256, which contains inode 1862~1872
diff --git a/tests/fsck-tests/013-extent-tree-rebuild/test.sh b/tests/fsck-tests/013-extent-tree-rebuild/test.sh
index 7419d6ea..ff7d28e5 100755
--- a/tests/fsck-tests/013-extent-tree-rebuild/test.sh
+++ b/tests/fsck-tests/013-extent-tree-rebuild/test.sh
@@ -2,8 +2,11 @@
 
 source $TOP/tests/common
 
+check_prereq btrfs-corrupt-block
 check_prereq btrfs-debug-tree
 check_prereq mkfs.btrfs
+check_prereq btrfs
+
 setup_root_helper
 prepare_test_dev 1G
 
diff --git a/tests/misc-tests/001-btrfstune-features/test.sh b/tests/misc-tests/001-btrfstune-features/test.sh
index 836e8d32..c858d701 100755
--- a/tests/misc-tests/001-btrfstune-features/test.sh
+++ b/tests/misc-tests/001-btrfstune-features/test.sh
@@ -6,6 +6,9 @@ source $TOP/tests/common
 check_prereq btrfs-debug-tree
 check_prereq btrfs-show-super
 check_prereq mkfs.btrfs
+check_prereq btrfstune
+check_prereq btrfs
+
 setup_root_helper
 prepare_test_dev
 
diff --git a/tests/misc-tests/002-uuid-rewrite/test.sh b/tests/misc-tests/002-uuid-rewrite/test.sh
index 9b103aaf..d84ec6ca 100755
--- a/tests/misc-tests/002-uuid-rewrite/test.sh
+++ b/tests/misc-tests/002-uuid-rewrite/test.sh
@@ -7,6 +7,8 @@ check_prereq btrfs-debug-tree
 check_prereq btrfs-show-super
 check_prereq mkfs.btrfs
 check_prereq btrfstune
+check_prereq btrfs
+
 prepare_test_dev
 
 get_fs_uuid() {
diff --git a/tests/misc-tests/004-shrink-fs/test.sh b/tests/misc-tests/004-shrink-fs/test.sh
index b1321520..88740358 100755
--- a/tests/misc-tests/004-shrink-fs/test.sh
+++ b/tests/misc-tests/004-shrink-fs/test.sh
@@ -7,6 +7,8 @@
 source $TOP/tests/common
 
 check_prereq mkfs.btrfs
+check_prereq btrfs
+
 setup_root_helper
 
 # Optionally take id of the device to shrink
diff --git a/tests/misc-tests/005-convert-progress-thread-crash/test.sh b/tests/misc-tests/005-convert-progress-thread-crash/test.sh
index 09ac8a3a..054069c2 100755
--- a/tests/misc-tests/005-convert-progress-thread-crash/test.sh
+++ b/tests/misc-tests/005-convert-progress-thread-crash/test.sh
@@ -3,7 +3,8 @@
 
 source $TOP/tests/common
 
-check_prereq btrfs
+check_prereq btrfs-convert
+
 mkfs.ext4 -V &>/dev/null || _not_run "mkfs.ext4 not found"
 prepare_test_dev 1G
 
diff --git a/tests/misc-tests/009-subvolume-sync-must-wait/test.sh b/tests/misc-tests/009-subvolume-sync-must-wait/test.sh
index 66d38ea5..056584e5 100755
--- a/tests/misc-tests/009-subvolume-sync-must-wait/test.sh
+++ b/tests/misc-tests/009-subvolume-sync-must-wait/test.sh
@@ -5,6 +5,8 @@
 source $TOP/tests/common
 
 check_prereq mkfs.btrfs
+check_prereq btrfs
+
 setup_root_helper
 
 run_check truncate -s 2G $IMAGE
diff --git a/tests/misc-tests/010-convert-delete-ext2-subvol/test.sh b/tests/misc-tests/010-convert-delete-ext2-subvol/test.sh
index 48936479..451e453a 100755
--- a/tests/misc-tests/010-convert-delete-ext2-subvol/test.sh
+++ b/tests/misc-tests/010-convert-delete-ext2-subvol/test.sh
@@ -6,7 +6,9 @@
 source $TOP/tests/common
 
 check_prereq btrfs-convert
+check_prereq btrfs-debug-tree
 check_prereq btrfs
+
 setup_root_helper
 prepare_test_dev
 
diff --git a/tests/misc-tests/011-delete-missing-device/test.sh b/tests/misc-tests/011-delete-missing-device/test.sh
index 70eddbc0..26645f10 100755
--- a/tests/misc-tests/011-delete-missing-device/test.sh
+++ b/tests/misc-tests/011-delete-missing-device/test.sh
@@ -3,6 +3,7 @@
 
 source $TOP/tests/common
 
+check_prereq btrfs-show-super
 check_prereq mkfs.btrfs
 check_prereq btrfs
 
diff --git a/tests/mkfs-tests/002-no-force-mixed-on-small-volume/test.sh b/tests/mkfs-tests/002-no-force-mixed-on-small-volume/test.sh
index 007a0eb9..855fbd18 100755
--- a/tests/mkfs-tests/002-no-force-mixed-on-small-volume/test.sh
+++ b/tests/mkfs-tests/002-no-force-mixed-on-small-volume/test.sh
@@ -4,8 +4,8 @@
 
 source $TOP/tests/common
 
-check_prereq btrfs-show-super
 check_prereq mkfs.btrfs
+
 setup_root_helper
 
 run_check truncate -s 512M $IMAGE
diff --git a/tests/mkfs-tests/004-rootdir-keeps-size/test.sh b/tests/mkfs-tests/004-rootdir-keeps-size/test.sh
index a78a3dec..7038c8ea 100755
--- a/tests/mkfs-tests/004-rootdir-keeps-size/test.sh
+++ b/tests/mkfs-tests/004-rootdir-keeps-size/test.sh
@@ -4,6 +4,7 @@
 source $TOP/tests/common
 
 check_prereq mkfs.btrfs
+
 prepare_test_dev
 
 test_mkfs_with_size() {
diff --git a/tests/mkfs-tests/005-long-device-name-for-ssd/test.sh b/tests/mkfs-tests/005-long-device-name-for-ssd/test.sh
index 02692eeb..c89ee0e1 100755
--- a/tests/mkfs-tests/005-long-device-name-for-ssd/test.sh
+++ b/tests/mkfs-tests/005-long-device-name-for-ssd/test.sh
@@ -4,7 +4,8 @@
 source $TOP/tests/common
 
 check_prereq mkfs.btrfs
-check_prereq btrfs
+check_prereq btrfs-show-super
+
 setup_root_helper
 prepare_test_dev
 
diff --git a/tests/mkfs-tests/006-partitioned-loopdev/test.sh b/tests/mkfs-tests/006-partitioned-loopdev/test.sh
index 5c92facd..7c9fb829 100755
--- a/tests/mkfs-tests/006-partitioned-loopdev/test.sh
+++ b/tests/mkfs-tests/006-partitioned-loopdev/test.sh
@@ -4,7 +4,8 @@
 source $TOP/tests/common
 
 check_prereq mkfs.btrfs
-check_prereq btrfs
+check_prereq btrfs-show-super
+
 setup_root_helper
 
 run_check truncate -s0 img
diff --git a/tests/mkfs-tests/007-mix-nodesize-sectorsize/test.sh b/tests/mkfs-tests/007-mix-nodesize-sectorsize/test.sh
index bb3c6620..d5374cbd 100755
--- a/tests/mkfs-tests/007-mix-nodesize-sectorsize/test.sh
+++ b/tests/mkfs-tests/007-mix-nodesize-sectorsize/test.sh
@@ -6,6 +6,7 @@ source $TOP/tests/common
 check_prereq btrfs-show-super
 check_prereq mkfs.btrfs
 check_prereq btrfs
+
 setup_root_helper
 prepare_test_dev
 
diff --git a/tests/mkfs-tests/008-secorsize-nodesize-combination/test.sh b/tests/mkfs-tests/008-secorsize-nodesize-combination/test.sh
index 68b79427..79cc2b22 100755
--- a/tests/mkfs-tests/008-secorsize-nodesize-combination/test.sh
+++ b/tests/mkfs-tests/008-secorsize-nodesize-combination/test.sh
@@ -8,6 +8,7 @@ source $TOP/tests/common
 
 check_prereq mkfs.btrfs
 check_prereq btrfs
+
 prepare_test_dev
 
 # disable mixed bg to avoid sectorsize == nodesize check