diff --git a/tests/cli-tests/002-balance-full-no-filters/test.sh b/tests/cli-tests/002-balance-full-no-filters/test.sh
index 3403b700..9c31dd6f 100755
--- a/tests/cli-tests/002-balance-full-no-filters/test.sh
+++ b/tests/cli-tests/002-balance-full-no-filters/test.sh
@@ -10,7 +10,7 @@ check_prereq btrfs
 setup_root_helper
 prepare_test_dev
 
-run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 
 run_check $SUDO_HELPER "$TOP/btrfs" balance start --full-balance "$TEST_MNT"
diff --git a/tests/cli-tests/003-fi-resize-args/test.sh b/tests/cli-tests/003-fi-resize-args/test.sh
index f6f598f2..4249c1ce 100755
--- a/tests/cli-tests/003-fi-resize-args/test.sh
+++ b/tests/cli-tests/003-fi-resize-args/test.sh
@@ -10,7 +10,7 @@ check_prereq btrfs
 setup_root_helper
 prepare_test_dev 2g
 
-run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 
 # missing the one of the required arguments
diff --git a/tests/cli-tests/004-send-parent-multi-subvol/test.sh b/tests/cli-tests/004-send-parent-multi-subvol/test.sh
index 165ef4a6..bb676b2e 100755
--- a/tests/cli-tests/004-send-parent-multi-subvol/test.sh
+++ b/tests/cli-tests/004-send-parent-multi-subvol/test.sh
@@ -10,7 +10,7 @@ check_prereq btrfs
 setup_root_helper
 prepare_test_dev
 
-run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 
 here=`pwd`
diff --git a/tests/cli-tests/005-qgroup-show/test.sh b/tests/cli-tests/005-qgroup-show/test.sh
index 10521039..c1454367 100755
--- a/tests/cli-tests/005-qgroup-show/test.sh
+++ b/tests/cli-tests/005-qgroup-show/test.sh
@@ -10,7 +10,7 @@ check_prereq btrfs
 setup_root_helper
 prepare_test_dev
 
-run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 run_mayfail "$TOP/btrfs" qgroup show "$TEST_MNT"
 run_mayfail $SUDO_HELPER "$TOP/btrfs" qgroup show "$TEST_MNT"
diff --git a/tests/cli-tests/006-qgroup-show-sync/test.sh b/tests/cli-tests/006-qgroup-show-sync/test.sh
index aec7a4ba..a0d6a02a 100755
--- a/tests/cli-tests/006-qgroup-show-sync/test.sh
+++ b/tests/cli-tests/006-qgroup-show-sync/test.sh
@@ -10,7 +10,7 @@ check_prereq btrfs
 setup_root_helper
 prepare_test_dev 1g
 
-run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 
 run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TEST_MNT/Sub"
diff --git a/tests/cli-tests/007-check-force/test.sh b/tests/cli-tests/007-check-force/test.sh
index deee96c8..317b8cf4 100755
--- a/tests/cli-tests/007-check-force/test.sh
+++ b/tests/cli-tests/007-check-force/test.sh
@@ -16,7 +16,7 @@ setup_loopdevs 1
 prepare_loopdevs
 TEST_DEV=${loopdevs[1]}
 
-run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 run_mustfail "checking mounted filesystem without --force" \
 	$SUDO_HELPER "$TOP/btrfs" check "$TEST_DEV"
diff --git a/tests/cli-tests/008-subvolume-get-set-default/test.sh b/tests/cli-tests/008-subvolume-get-set-default/test.sh
index 706ee8c5..43d4da09 100755
--- a/tests/cli-tests/008-subvolume-get-set-default/test.sh
+++ b/tests/cli-tests/008-subvolume-get-set-default/test.sh
@@ -18,7 +18,7 @@ check_prereq btrfs
 setup_root_helper
 prepare_test_dev
 
-run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 cd "$TEST_MNT"
 
diff --git a/tests/cli-tests/009-btrfstune/test.sh b/tests/cli-tests/009-btrfstune/test.sh
index c7399465..40f34abb 100755
--- a/tests/cli-tests/009-btrfstune/test.sh
+++ b/tests/cli-tests/009-btrfstune/test.sh
@@ -8,26 +8,22 @@ check_prereq btrfstune
 setup_root_helper
 prepare_test_dev
 
-test_do_mkfs() {
-	run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$@" "$TEST_DEV"
-}
-
 run_mayfail "$TOP/btrfstune" || true
 run_check "$TOP/btrfstune" --help
 
 run_mustfail "must not work on non-existent device" \
 	"$TOP/btrfstune" -r file-does-not-exist
 
-test_do_mkfs -O ^extref
+run_check_mkfs_test_dev -O ^extref
 run_check "$TOP/btrfstune" -r "$TEST_DEV"
 
-test_do_mkfs -O ^skinny-metadata
+run_check_mkfs_test_dev -O ^skinny-metadata
 run_check "$TOP/btrfstune" -x "$TEST_DEV"
 
-test_do_mkfs -O ^no-holes
+run_check_mkfs_test_dev -O ^no-holes
 run_check "$TOP/btrfstune" -n "$TEST_DEV"
 
-test_do_mkfs
+run_check_mkfs_test_dev
 run_check "$TOP/btrfstune" -S 1 "$TEST_DEV"
 echo n | run_mayfail "$TOP/btrfstune" -S 0 "$TEST_DEV" || true
 run_check "$TOP/btrfstune" -f -S 0 "$TEST_DEV"
@@ -35,27 +31,27 @@ run_check "$TOP/btrfstune" -f -S 0 "$TEST_DEV"
 run_mustfail "negative number for seeding status" \
 	"$TOP/btrfstune" -f -S -1 "$TEST_DEV"
 
-test_do_mkfs
+run_check_mkfs_test_dev
 echo n | run_mayfail "$TOP/btrfstune" -u "$TEST_DEV" || true
 run_check "$TOP/btrfstune" -f -u "$TEST_DEV"
 
 uuid="e315420e-3a1f-4d81-849e-93b68b85b76f"
 baduuid="1-2-3-4-5"
-test_do_mkfs
+run_check_mkfs_test_dev
 echo n | run_mayfail "$TOP/btrfstune" -U "$uuid" "$TEST_DEV" || true
 run_check "$TOP/btrfstune" -f -U "$uuid" "$TEST_DEV"
 
 run_mustfail "non-conforming uuid accepted" \
 	"$TOP/btrfstune" -U "$baduuid" "$TEST_DEV"
 
-test_do_mkfs
+run_check_mkfs_test_dev
 echo n | run_mayfail "$TOP/btrfstune" -m "$TEST_DEV" || true
 run_check "$TOP/btrfstune" -f -m "$TEST_DEV"
 
 uuid="2a9716ee-2786-4baa-ab85-f82c50fa883c"
-test_do_mkfs
+run_check_mkfs_test_dev
 run_mayfail "$TOP/btrfstune" -M "$uuid" "$TEST_DEV" || true
-test_do_mkfs
+run_check_mkfs_test_dev
 run_check "$TOP/btrfstune" -f -M "$uuid" "$TEST_DEV"
 
 run_mustfail "non-conforming uuid accepted" \
diff --git a/tests/fsck-tests/013-extent-tree-rebuild/test.sh b/tests/fsck-tests/013-extent-tree-rebuild/test.sh
index 02afdda1..ac5a406a 100755
--- a/tests/fsck-tests/013-extent-tree-rebuild/test.sh
+++ b/tests/fsck-tests/013-extent-tree-rebuild/test.sh
@@ -12,8 +12,7 @@ prepare_test_dev
 # test whether fsck can rebuild a corrupted extent tree
 test_extent_tree_rebuild()
 {
-	run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV"
-
+	run_check_mkfs_test_dev
 	run_check_mount_test_dev
 	generate_dataset small
 
diff --git a/tests/fsck-tests/024-clear-space-cache/test.sh b/tests/fsck-tests/024-clear-space-cache/test.sh
index 6a3a31ec..056384af 100755
--- a/tests/fsck-tests/024-clear-space-cache/test.sh
+++ b/tests/fsck-tests/024-clear-space-cache/test.sh
@@ -9,7 +9,7 @@ check_prereq mkfs.btrfs
 setup_root_helper
 prepare_test_dev
 
-run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 
 # Create files that takes at least 3 data chunks, while
diff --git a/tests/fsck-tests/025-file-extents/test.sh b/tests/fsck-tests/025-file-extents/test.sh
index db066ee1..94cddc89 100755
--- a/tests/fsck-tests/025-file-extents/test.sh
+++ b/tests/fsck-tests/025-file-extents/test.sh
@@ -17,7 +17,7 @@ prepare_test_dev 128M
 # Lowmem mode can report missing csum due to wrong csum range
 test_partial_write_into_prealloc()
 {
-	run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+	run_check_mkfs_test_dev
 	run_check_mount_test_dev
 
 	run_check $SUDO_HELPER fallocate -l 128K "$TEST_MNT/file"
@@ -32,7 +32,7 @@ test_partial_write_into_prealloc()
 # due to too restrict check on inline extent size
 test_compressed_inline_extent()
 {
-	run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+	run_check_mkfs_test_dev
 	run_check_mount_test_dev -o compress=lzo,max_inline=2048
 
 	run_check $SUDO_HELPER dd conv=notrunc if=/dev/null of="$TEST_MNT/file" bs=1K count=1
@@ -46,7 +46,7 @@ test_compressed_inline_extent()
 # false alert
 test_hole_extent_with_no_holes_flag()
 {
-	run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+	run_check_mkfs_test_dev
 	run_check_mount_test_dev
 
 	run_check $SUDO_HELPER truncate -s 16K "$TEST_MNT/tmp"
diff --git a/tests/fsck-tests/031-metadatadump-check-data-csum/test.sh b/tests/fsck-tests/031-metadatadump-check-data-csum/test.sh
index 7f3872e6..1590ce6d 100755
--- a/tests/fsck-tests/031-metadatadump-check-data-csum/test.sh
+++ b/tests/fsck-tests/031-metadatadump-check-data-csum/test.sh
@@ -10,7 +10,7 @@ check_prereq btrfs-image
 setup_root_helper
 prepare_test_dev
 
-run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 
 run_check $SUDO_HELPER dd if=/dev/urandom of="$TEST_MNT/file" bs=4k count=16
diff --git a/tests/fsck-tests/033-lowmem-collission-dir-items/test.sh b/tests/fsck-tests/033-lowmem-collission-dir-items/test.sh
index 60f34b25..b9e0b2bc 100755
--- a/tests/fsck-tests/033-lowmem-collission-dir-items/test.sh
+++ b/tests/fsck-tests/033-lowmem-collission-dir-items/test.sh
@@ -11,7 +11,7 @@ check_prereq mkfs.btrfs
 setup_root_helper
 prepare_test_dev
 
-run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 
 # Create 2 files whose names collide
diff --git a/tests/fsck-tests/037-freespacetree-repair/test.sh b/tests/fsck-tests/037-freespacetree-repair/test.sh
index a0bdf9e2..7f547a33 100755
--- a/tests/fsck-tests/037-freespacetree-repair/test.sh
+++ b/tests/fsck-tests/037-freespacetree-repair/test.sh
@@ -55,7 +55,7 @@ if ! [ -f "/sys/fs/btrfs/features/free_space_tree" ]; then
 	exit
 fi
 
-run_check "$TOP/mkfs.btrfs" -n 4k -f "$TEST_DEV"
+run_check_mkfs_test_dev -n 4k
 run_check_mount_test_dev -oclear_cache,space_cache=v2
 
 # create files which will populate the FST
diff --git a/tests/misc-tests/001-btrfstune-features/test.sh b/tests/misc-tests/001-btrfstune-features/test.sh
index e3da3949..b3ece328 100755
--- a/tests/misc-tests/001-btrfstune-features/test.sh
+++ b/tests/misc-tests/001-btrfstune-features/test.sh
@@ -25,8 +25,7 @@ test_feature()
 	tuneopt="$2"
 	sbflag="$3"
 
-	run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f \
-		${mkfsfeatures:+-O ^"$mkfsfeatures"} "$TEST_DEV"
+	run_check_mkfs_test_dev ${mkfsfeatures:+-O ^"$mkfsfeatures"}
 	if run_check_stdout "$TOP/btrfs" inspect-internal dump-super "$TEST_DEV" | \
 			grep -q "$sbflag"; then
 		_fail "FAIL: feature $sbflag must not be set on the base image"
diff --git a/tests/misc-tests/002-uuid-rewrite/test.sh b/tests/misc-tests/002-uuid-rewrite/test.sh
index 0191bd5c..b191f8bd 100755
--- a/tests/misc-tests/002-uuid-rewrite/test.sh
+++ b/tests/misc-tests/002-uuid-rewrite/test.sh
@@ -20,10 +20,9 @@ test_uuid_random()
 
 	origuuid=11111111-a101-4031-b29a-379d4f8b7a2d
 
-	run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f \
+	run_check_mkfs_test_dev    \
 		--uuid "$origuuid" \
-		--rootdir "$INTERNAL_BIN/Documentation" \
-		"$TEST_DEV"
+		--rootdir "$INTERNAL_BIN/Documentation"
 	run_check "$TOP/btrfs" inspect-internal dump-super "$TEST_DEV"
 	currentfsid=$(run_check_stdout "$TOP/btrfstune" -f -u "$TEST_DEV" | \
 		grep -i 'current fsid:' | awk '{print $3}')
@@ -42,10 +41,9 @@ test_uuid_user()
 	origuuid=22222222-d324-4f92-80e9-7658bf3b845f
 	newuuid=33333333-bfc9-4045-9399-a396dc6893b3
 
-	run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f \
+	run_check_mkfs_test_dev    \
 		--uuid "$origuuid" \
-		--rootdir "$INTERNAL_BIN/Documentation" \
-		"$TEST_DEV"
+		--rootdir "$INTERNAL_BIN/Documentation"
 	run_check "$TOP/btrfs" inspect-internal dump-super "$TEST_DEV"
 	run_check "$TOP/btrfstune" -f -U "$newuuid" \
 		"$TEST_DEV"
diff --git a/tests/misc-tests/003-zero-log/test.sh b/tests/misc-tests/003-zero-log/test.sh
index c6742bf3..f993038b 100755
--- a/tests/misc-tests/003-zero-log/test.sh
+++ b/tests/misc-tests/003-zero-log/test.sh
@@ -20,9 +20,7 @@ get_log_root_level() {
 test_zero_log()
 {
 	# FIXME: we need an image with existing log_root
-	run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f \
-		--rootdir "$INTERNAL_BIN/Documentation" \
-		"$TEST_DEV"
+	run_check_mkfs_test_dev --rootdir "$INTERNAL_BIN/Documentation"
 	run_check "$TOP/btrfs" inspect-internal dump-super "$TEST_DEV"
 	run_check "$TOP/btrfs" rescue zero-log "$TEST_DEV"
 	log_root=$(get_log_root "$TEST_DEV")
diff --git a/tests/misc-tests/007-subvolume-sync/test.sh b/tests/misc-tests/007-subvolume-sync/test.sh
index 104b50ea..e8a2a42c 100755
--- a/tests/misc-tests/007-subvolume-sync/test.sh
+++ b/tests/misc-tests/007-subvolume-sync/test.sh
@@ -12,7 +12,7 @@ check_prereq btrfs
 setup_root_helper
 prepare_test_dev
 
-run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 
 # to check following thing in both 1 and multiple subvolume case:
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 62190e14..91dcebbb 100755
--- a/tests/misc-tests/009-subvolume-sync-must-wait/test.sh
+++ b/tests/misc-tests/009-subvolume-sync-must-wait/test.sh
@@ -10,7 +10,8 @@ check_prereq btrfs
 setup_root_helper
 
 prepare_test_dev
-run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 run_check $SUDO_HELPER chmod a+rw "$TEST_MNT"
 
diff --git a/tests/misc-tests/011-delete-missing-device/test.sh b/tests/misc-tests/011-delete-missing-device/test.sh
index a6b2e29c..3871ca77 100755
--- a/tests/misc-tests/011-delete-missing-device/test.sh
+++ b/tests/misc-tests/011-delete-missing-device/test.sh
@@ -48,7 +48,7 @@ test_missing_error()
 {
 	local out
 
-	run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+	run_check_mkfs_test_dev
 	run_check_mount_test_dev
 	out=$(run_mustfail_stdout "device remove succeeded" \
 		$SUDO_HELPER "$TOP/btrfs" device remove missing "$TEST_MNT")
diff --git a/tests/misc-tests/013-subvolume-sync-crash/test.sh b/tests/misc-tests/013-subvolume-sync-crash/test.sh
index c348ba5d..64ba9959 100755
--- a/tests/misc-tests/013-subvolume-sync-crash/test.sh
+++ b/tests/misc-tests/013-subvolume-sync-crash/test.sh
@@ -11,7 +11,7 @@ check_prereq btrfs
 setup_root_helper
 
 prepare_test_dev
-run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 run_check $SUDO_HELPER chmod a+rw "$TEST_MNT"
 
diff --git a/tests/misc-tests/014-filesystem-label/test.sh b/tests/misc-tests/014-filesystem-label/test.sh
index 4756e764..4f63c9b7 100755
--- a/tests/misc-tests/014-filesystem-label/test.sh
+++ b/tests/misc-tests/014-filesystem-label/test.sh
@@ -10,7 +10,7 @@ check_prereq btrfs
 setup_root_helper
 
 prepare_test_dev
-run_check "$TOP/mkfs.btrfs" -L BTRFS-TEST-LABEL -f "$TEST_DEV"
+run_check_mkfs_test_dev -L BTRFS-TEST-LABEL
 run_check_mount_test_dev
 run_check $SUDO_HELPER chmod a+rw "$TEST_MNT"
 
diff --git a/tests/misc-tests/016-send-clone-src/test.sh b/tests/misc-tests/016-send-clone-src/test.sh
index c993095e..1dbad6f4 100755
--- a/tests/misc-tests/016-send-clone-src/test.sh
+++ b/tests/misc-tests/016-send-clone-src/test.sh
@@ -9,9 +9,9 @@ check_prereq mkfs.btrfs
 check_prereq btrfs
 
 setup_root_helper
-
 prepare_test_dev
-run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 
 here=`pwd`
diff --git a/tests/misc-tests/017-recv-stream-malformatted/test.sh b/tests/misc-tests/017-recv-stream-malformatted/test.sh
index 991f2569..3ba37392 100755
--- a/tests/misc-tests/017-recv-stream-malformatted/test.sh
+++ b/tests/misc-tests/017-recv-stream-malformatted/test.sh
@@ -8,9 +8,9 @@ check_prereq mkfs.btrfs
 check_prereq btrfs
 
 setup_root_helper
-
 prepare_test_dev
-run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 
 echo -n '' | run_mayfail $SUDO_HELPER "$TOP/btrfs" receive "$TEST_MNT" &&
diff --git a/tests/misc-tests/018-recv-end-of-stream/test.sh b/tests/misc-tests/018-recv-end-of-stream/test.sh
index 0de7d3b6..1acb2ad7 100755
--- a/tests/misc-tests/018-recv-end-of-stream/test.sh
+++ b/tests/misc-tests/018-recv-end-of-stream/test.sh
@@ -19,7 +19,7 @@ test_full_empty_stream() {
 	local str
 
 	str="$here/stream-full-empty.stream"
-	run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+	run_check_mkfs_test_dev
 	run_check_mount_test_dev
 
 	cd "$TEST_MNT" || _fail "cannot chdir to TEST_MNT"
@@ -34,7 +34,7 @@ test_full_empty_stream() {
 	cd "$here" || _fail "cannot chdir back to test directory"
 	run_check_umount_test_dev
 
-	run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+	run_check_mkfs_test_dev
 	run_check_mount_test_dev
 	run_check $SUDO_HELPER "$TOP/btrfs" receive "$@" -v -f "$str" "$TEST_MNT"
 	run_check_umount_test_dev
@@ -46,7 +46,7 @@ test_full_simple_stream() {
 	local str
 
 	str="$here/stream-full-simple.stream"
-	run_check "$TOP/mkfs.btrfs" -f $TEST_DEV
+	run_check_mkfs_test_dev
 	run_check_mount_test_dev
 
 	cd "$TEST_MNT" || _fail "cannot chdir to TEST_MNT"
@@ -65,7 +65,7 @@ test_full_simple_stream() {
 	cd "$here" || _fail "cannot chdir back to test directory"
 	run_check_umount_test_dev
 
-	run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+	run_check_mkfs_test_dev
 	run_check_mount_test_dev
 	run_check $SUDO_HELPER "$TOP/btrfs" receive "$@" -v -f "$str" "$TEST_MNT"
 	run_check_umount_test_dev
@@ -79,7 +79,7 @@ test_incr_empty_stream() {
 
 	fstr="$here/stream-full-empty.stream"
 	istr="$here/stream-incr-empty.stream"
-	run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+	run_check_mkfs_test_dev
 	run_check_mount_test_dev
 
 	cd "$TEST_MNT" || _fail "cannot chdir to TEST_MNT"
@@ -96,7 +96,7 @@ test_incr_empty_stream() {
 	cd "$here" || _fail "cannot chdir back to test directory"
 	run_check_umount_test_dev
 
-	run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+	run_check_mkfs_test_dev
 	run_check_mount_test_dev
 	run_check $SUDO_HELPER "$TOP/btrfs" receive "$@" -v -f "$fstr" "$TEST_MNT"
 	run_check $SUDO_HELPER "$TOP/btrfs" receive "$@" -v -f "$istr" "$TEST_MNT"
@@ -110,7 +110,7 @@ test_incr_simple_stream() {
 
 	fstr="$here/stream-full-simple.stream"
 	istr="$here/stream-incr-simple.stream"
-	run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+	run_check_mkfs_test_dev
 	run_check_mount_test_dev
 
 	cd "$TEST_MNT" || _fail "cannot chdir to TEST_MNT"
@@ -136,7 +136,7 @@ test_incr_simple_stream() {
 	cd "$here" || _fail "cannot chdir back to test directory"
 	run_check_umount_test_dev
 
-	run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+	run_check_mkfs_test_dev
 	run_check_mount_test_dev
 	run_check $SUDO_HELPER "$TOP/btrfs" receive "$@" -v -f "$fstr" "$TEST_MNT"
 	run_check $SUDO_HELPER "$TOP/btrfs" receive "$@" -v -f "$istr" "$TEST_MNT"
diff --git a/tests/misc-tests/019-receive-clones-on-mounted-subvol/test.sh b/tests/misc-tests/019-receive-clones-on-mounted-subvol/test.sh
index 6937163a..6bde2c53 100755
--- a/tests/misc-tests/019-receive-clones-on-mounted-subvol/test.sh
+++ b/tests/misc-tests/019-receive-clones-on-mounted-subvol/test.sh
@@ -20,7 +20,7 @@ rm -rf "$srcdir"
 mkdir -p "$srcdir"
 run_check chmod a+rw "$srcdir"
 
-run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 
 BLOCK_SIZE=$(stat -f -c %S "$TEST_MNT")
@@ -100,7 +100,7 @@ run_check $FSSUM_PROG -A -f -w "$srcdir/bar.0.fssum" "$TEST_MNT/snap/bar.0"
 run_check $FSSUM_PROG -A -f -w "$srcdir/baz.0.fssum" "$TEST_MNT/snap/baz.0"
 
 run_check_umount_test_dev
-run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TEST_MNT/dest"
 run_check_umount_test_dev
diff --git a/tests/misc-tests/020-fix-superblock-corruption/test.sh b/tests/misc-tests/020-fix-superblock-corruption/test.sh
index 8f3d20fe..404d416b 100755
--- a/tests/misc-tests/020-fix-superblock-corruption/test.sh
+++ b/tests/misc-tests/020-fix-superblock-corruption/test.sh
@@ -14,7 +14,7 @@ FIRST_SUPERBLOCK_OFFSET=65536
 
 test_superblock_restore()
 {
-	run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+	run_check_mkfs_test_dev
 
 	# Corrupt superblock checksum
 	run_check $SUDO_HELPER dd if=/dev/zero of="$TEST_DEV" \
diff --git a/tests/misc-tests/022-filesystem-du-on-empty-subvol/test.sh b/tests/misc-tests/022-filesystem-du-on-empty-subvol/test.sh
index 54365289..7b83c712 100755
--- a/tests/misc-tests/022-filesystem-du-on-empty-subvol/test.sh
+++ b/tests/misc-tests/022-filesystem-du-on-empty-subvol/test.sh
@@ -9,7 +9,7 @@ check_prereq btrfs
 setup_root_helper
 prepare_test_dev
 
-run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 
 cd "$TEST_MNT"
diff --git a/tests/misc-tests/024-inspect-internal-rootid/test.sh b/tests/misc-tests/024-inspect-internal-rootid/test.sh
index ea0c6298..b1c804d9 100755
--- a/tests/misc-tests/024-inspect-internal-rootid/test.sh
+++ b/tests/misc-tests/024-inspect-internal-rootid/test.sh
@@ -9,7 +9,7 @@ check_prereq btrfs
 
 prepare_test_dev
 
-run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 run_check $SUDO_HELPER chmod a+rw "$TEST_MNT"
 cd "$TEST_MNT"
diff --git a/tests/misc-tests/026-image-non-printable-chars/test.sh b/tests/misc-tests/026-image-non-printable-chars/test.sh
index edd437c0..5a25183c 100755
--- a/tests/misc-tests/026-image-non-printable-chars/test.sh
+++ b/tests/misc-tests/026-image-non-printable-chars/test.sh
@@ -9,7 +9,7 @@ check_prereq btrfs
 
 prepare_test_dev
 
-run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 run_check $SUDO_HELPER chmod a+rw "$TEST_MNT"
 
diff --git a/tests/misc-tests/027-subvol-list-deleted-toplevel/test.sh b/tests/misc-tests/027-subvol-list-deleted-toplevel/test.sh
index 3b73dd36..15eb15be 100755
--- a/tests/misc-tests/027-subvol-list-deleted-toplevel/test.sh
+++ b/tests/misc-tests/027-subvol-list-deleted-toplevel/test.sh
@@ -8,7 +8,7 @@ check_prereq btrfs
 
 prepare_test_dev
 
-run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 run_check_stdout $SUDO_HELPER "$TOP/btrfs" subvolume list "$TEST_MNT" |
 	grep -i -q "id 5" && _fail "found toplevel among regular"
diff --git a/tests/misc-tests/028-superblock-recover/test.sh b/tests/misc-tests/028-superblock-recover/test.sh
index ee117d0f..26e4dcbf 100755
--- a/tests/misc-tests/028-superblock-recover/test.sh
+++ b/tests/misc-tests/028-superblock-recover/test.sh
@@ -10,8 +10,7 @@ check_prereq btrfs-select-super
 setup_root_helper
 prepare_test_dev 260G
 
-# Create the test file system.
-run_check $SUDO_HELPER "$TOP"/mkfs.btrfs -f "$TEST_DEV"
+run_check_mkfs_test_dev
 
 function check_corruption {
 	local sb_offset=$1
diff --git a/tests/misc-tests/029-send-p-different-mountpoints/test.sh b/tests/misc-tests/029-send-p-different-mountpoints/test.sh
index a59a585e..5a5ec159 100755
--- a/tests/misc-tests/029-send-p-different-mountpoints/test.sh
+++ b/tests/misc-tests/029-send-p-different-mountpoints/test.sh
@@ -16,7 +16,7 @@ TOPLEVEL_MNT="$TEST_MNT/toplevel"
 TEST_MNT="$TOPLEVEL_MNT"
 run_check $SUDO_HELPER mkdir -p "$TOPLEVEL_MNT" "$SUBVOL_MNT"
 
-run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 
 run_check $SUDO_HELPER "$TOP/btrfs" subvolume create "$TOPLEVEL_MNT/subv1"
diff --git a/tests/misc-tests/031-qgroup-parent-child-relation/test.sh b/tests/misc-tests/031-qgroup-parent-child-relation/test.sh
index 2d66fd60..f8529058 100755
--- a/tests/misc-tests/031-qgroup-parent-child-relation/test.sh
+++ b/tests/misc-tests/031-qgroup-parent-child-relation/test.sh
@@ -9,7 +9,7 @@ check_prereq btrfs
 setup_root_helper
 prepare_test_dev
 
-run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 
 run_check $SUDO_HELPER "$TOP/btrfs" quota enable "$TEST_MNT"
diff --git a/tests/misc-tests/033-filename-length-limit/test.sh b/tests/misc-tests/033-filename-length-limit/test.sh
index 673138e2..a858e59e 100755
--- a/tests/misc-tests/033-filename-length-limit/test.sh
+++ b/tests/misc-tests/033-filename-length-limit/test.sh
@@ -10,7 +10,7 @@ check_prereq btrfs
 setup_root_helper
 prepare_test_dev
 
-run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 run_check_mount_test_dev
 run_check $SUDO_HELPER chmod a+rw "$TEST_MNT"
 
diff --git a/tests/misc-tests/034-metadata-uuid/test.sh b/tests/misc-tests/034-metadata-uuid/test.sh
index 72af0472..689efdbf 100755
--- a/tests/misc-tests/034-metadata-uuid/test.sh
+++ b/tests/misc-tests/034-metadata-uuid/test.sh
@@ -39,17 +39,17 @@ function check_btrfstune {
 		$SUDO_HELPER "$TOP/btrfstune" -S 1 "$TEST_DEV"
 
 	# test that setting both seed and -m|M is forbidden
-	run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+	run_check_mkfs_test_dev
 	run_mustfail "Succeeded setting seed and changing fs uuid" \
 		$SUDO_HELPER "$TOP/btrfstune" -S 1 -m "$TEST_DEV"
 
 	# test that having -m|-M on seed device is forbidden
-	run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+	run_check_mkfs_test_dev
 	run_check $SUDO_HELPER "$TOP/btrfstune" -S 1 "$TEST_DEV"
 	run_mustfail "Succeded changing fsid on a seed device" $SUDO_HELPER "$TOP/btrfstune" -m "$TEST_DEV"
 
 	# test that using -U|-u on an fs with METADATA_UUID flag is forbidden
-	run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+	run_check_mkfs_test_dev
 	run_check $SUDO_HELPER "$TOP/btrfstune" -m "$TEST_DEV"
 	run_mustfail "Succeeded triggering FSID rewrite while METADATA_UUID is active" \
 		$SUDO_HELPER "$TOP/btrfstune" -u  "$TEST_DEV"
@@ -113,14 +113,14 @@ function check_image_restore {
 	local metadata_uuid_restored
 
 	echo "TESTING btrfs-image restore" >> "$RESULTS"
-	run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+	run_check_mkfs_test_dev
 	run_check $SUDO_HELPER "$TOP/btrfstune" -m "$TEST_DEV"
 	fsid=$(read_fsid "$TEST_DEV")
 	metadata_uuid=$(read_metadata_uuid "$TEST_DEV")
 	run_mayfail $SUDO_HELPER "$TOP/btrfs-image" "$TEST_DEV" /tmp/test-img.dump
 	# erase the fs by creating a new one, wipefs is not sufficient as it just
 	# deletes the fs magic string
-	run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+	run_check_mkfs_test_dev
 	run_check $SUDO_HELPER "$TOP/btrfs-image" -r /tmp/test-img.dump "$TEST_DEV"
 	fsid_restored=$(read_fsid "$TEST_DEV")
 	metadata_uuid_restored=$(read_metadata_uuid "$TEST_DEV")
@@ -191,13 +191,13 @@ modinfo btrfs > /dev/null 2>&1 || _not_run "btrfs must be a module"
 modprobe -r btrfs || _not_run "btrfs must be unloadable"
 modprobe btrfs || _not_run "loading btrfs module failed"
 
-run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 check_btrfstune
 
-run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 check_dump_super_output
 
-run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+run_check_mkfs_test_dev
 check_image_restore
 
 # disk1 is an image which has no metadata uuid flags set and disk2 is part of
diff --git a/tests/mkfs-tests/004-rootdir-keeps-size/test.sh b/tests/mkfs-tests/004-rootdir-keeps-size/test.sh
index 635a5137..9ce5a2f9 100755
--- a/tests/mkfs-tests/004-rootdir-keeps-size/test.sh
+++ b/tests/mkfs-tests/004-rootdir-keeps-size/test.sh
@@ -15,9 +15,7 @@ test_mkfs_with_size() {
 	size="$1"
 	run_check truncate -s"$size" "$TEST_DEV"
 	imgsize=$(run_check_stdout stat --format=%s "$TEST_DEV")
-	run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f \
-		--rootdir "$INTERNAL_BIN/Documentation" \
-		"$TEST_DEV"
+	run_check_mkfs_test_dev --rootdir "$INTERNAL_BIN/Documentation"
 	tmp=$(run_check_stdout stat --format=%s "$TEST_DEV")
 	if ! [ "$imgsize" = "$tmp" ]; then
 		_fail "image size changed from $imgsize to $tmp"
diff --git a/tests/mkfs-tests/007-mix-nodesize-sectorsize/test.sh b/tests/mkfs-tests/007-mix-nodesize-sectorsize/test.sh
index 31f44f33..0bf4bff0 100755
--- a/tests/mkfs-tests/007-mix-nodesize-sectorsize/test.sh
+++ b/tests/mkfs-tests/007-mix-nodesize-sectorsize/test.sh
@@ -11,7 +11,7 @@ prepare_test_dev
 
 test_mkfs_single()
 {
-	run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$@" "$TEST_DEV"
+	run_check_mkfs_test_dev "$@"
 	run_check $SUDO_HELPER "$TOP/btrfs" inspect-internal dump-super "$TEST_DEV"
 	run_check $SUDO_HELPER "$TOP/btrfs" check "$TEST_DEV"
 }
diff --git a/tests/mkfs-tests/009-special-files-for-rootdir/test.sh b/tests/mkfs-tests/009-special-files-for-rootdir/test.sh
index a94d5209..6a954237 100755
--- a/tests/mkfs-tests/009-special-files-for-rootdir/test.sh
+++ b/tests/mkfs-tests/009-special-files-for-rootdir/test.sh
@@ -29,7 +29,7 @@ run_check $SUDO_HELPER mknod "$tmp/char" c 1 1
 run_check $SUDO_HELPER mknod "$tmp/block" b 1 1
 run_check dd if=/dev/zero bs=1M count=1 of="$tmp/regular"
 
-run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f -r "$tmp" "$TEST_DEV"
+run_check_mkfs_test_dev -r "$tmp"
 
 rm -rf -- "$tmp"
 
diff --git a/tests/mkfs-tests/010-minimal-size/test.sh b/tests/mkfs-tests/010-minimal-size/test.sh
index 0ebe0995..8480e4c5 100755
--- a/tests/mkfs-tests/010-minimal-size/test.sh
+++ b/tests/mkfs-tests/010-minimal-size/test.sh
@@ -19,7 +19,7 @@ do_test()
 
 	prepare_test_dev "$good_size"
 	echo "Minimal device size is $good_size" >> "$RESULTS"
-	run_check $TOP/mkfs.btrfs -f "$@" "$TEST_DEV"
+	run_check_mkfs_test_dev "$@"
 	run_check_mount_test_dev
 	run_check_umount_test_dev
 }
diff --git a/tests/mkfs-tests/012-rootdir-no-shrink/test.sh b/tests/mkfs-tests/012-rootdir-no-shrink/test.sh
index 765f8cdd..0a6625fa 100755
--- a/tests/mkfs-tests/012-rootdir-no-shrink/test.sh
+++ b/tests/mkfs-tests/012-rootdir-no-shrink/test.sh
@@ -15,7 +15,7 @@ prepare_test_dev "$fs_size"
 
 # No shrink case
 
-run_check "$TOP/mkfs.btrfs" -f --rootdir "$tmp" "$TEST_DEV"
+run_check_mkfs_test_dev --rootdir "$tmp"
 run_check_mount_test_dev
 
 # We should be able to write at least half of the fs size data since the fs is
@@ -27,7 +27,7 @@ run_check_umount_test_dev
 
 # Shrink case
 
-run_check "$TOP/mkfs.btrfs" -f --rootdir "$tmp" --shrink "$TEST_DEV"
+run_check_mkfs_test_dev --rootdir "$tmp" --shrink
 run_check_mount_test_dev
 
 run_mustfail "mkfs.btrfs for shrink rootdir" \
diff --git a/tests/mkfs-tests/013-reserved-1M-for-single/test.sh b/tests/mkfs-tests/013-reserved-1M-for-single/test.sh
index 1944ad93..56b3497c 100755
--- a/tests/mkfs-tests/013-reserved-1M-for-single/test.sh
+++ b/tests/mkfs-tests/013-reserved-1M-for-single/test.sh
@@ -15,7 +15,7 @@ prepare_test_dev
 
 do_one_test ()
 {
-	run_check "$TOP/mkfs.btrfs" -f "$@" "$TEST_DEV"
+	run_check_mkfs_test_dev "$@"
 
 	# Use dev-extent tree to find first device extent
 	first_dev_extent=$(run_check_stdout "$TOP/btrfs" inspect-internal \
diff --git a/tests/mkfs-tests/014-rootdir-inline-extent/test.sh b/tests/mkfs-tests/014-rootdir-inline-extent/test.sh
index 09a96004..4f451b4b 100755
--- a/tests/mkfs-tests/014-rootdir-inline-extent/test.sh
+++ b/tests/mkfs-tests/014-rootdir-inline-extent/test.sh
@@ -21,8 +21,7 @@ create_file()
 test_mkfs_rootdir()
 {
 	nodesize=$1
-	run_check "$TOP/mkfs.btrfs" --nodesize "$nodesize" -f --rootdir "$tmp" \
-		"$TEST_DEV"
+	run_check_mkfs_test_dev --nodesize "$nodesize" --rootdir "$tmp"
 	run_check $SUDO_HELPER "$TOP/btrfs" check "$TEST_DEV"
 }
 
diff --git a/tests/mkfs-tests/015-fstree-uuid-otime/test.sh b/tests/mkfs-tests/015-fstree-uuid-otime/test.sh
index a2e04a3f..51c1bf00 100755
--- a/tests/mkfs-tests/015-fstree-uuid-otime/test.sh
+++ b/tests/mkfs-tests/015-fstree-uuid-otime/test.sh
@@ -17,7 +17,7 @@ prepare_test_dev
 #         otime 1521656113.0 (2018-03-21 19:15:13)
 #         drop key (0 UNKNOWN.0 0) level 0
 
-run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$@" "$TEST_DEV"
+run_check_mkfs_test_dev
 # match not-all-zeros in the first part
 uuid=$(run_check_stdout $SUDO_HELPER "$TOP/btrfs" inspect-internal dump-tree -t root "$TEST_DEV" | \
 	grep -A 3 "FS_TREE ROOT_ITEM 0" | grep 'uuid ')