diff --git a/tests/convert-tests/005-delete-all-rollback/test.sh b/tests/convert-tests/005-delete-all-rollback/test.sh
index 0541afff..2024bc8a 100755
--- a/tests/convert-tests/005-delete-all-rollback/test.sh
+++ b/tests/convert-tests/005-delete-all-rollback/test.sh
@@ -29,7 +29,7 @@ do_test() {
 	convert_test_preamble "$features" "$msg" "$nodesize" "$@"
 	convert_test_prep_fs ext4 "$@"
 	populate_fs
-	CHECKSUMTMP=$(mktemp --tmpdir btrfs-progs-convert.XXXXXX)
+	CHECKSUMTMP=$(_mktemp convert)
 	convert_test_gen_checksums "$CHECKSUMTMP"
 
 	run_check_umount_test_dev
diff --git a/tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh b/tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh
index 27e78e9c..bd982b66 100755
--- a/tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh
+++ b/tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh
@@ -32,7 +32,7 @@ do_test() {
 	convert_test_preamble "$features" "$msg" "$nodesize" "$@"
 	convert_test_prep_fs reiserfs "$@"
 	populate_fs
-	CHECKSUMTMP=$(mktemp --tmpdir btrfs-progs-convert.XXXXXX)
+	CHECKSUMTMP=$(_mktemp convert)
 	convert_test_gen_checksums "$CHECKSUMTMP"
 
 	run_check_umount_test_dev
diff --git a/tests/misc-tests/025-zstd-compression/test.sh b/tests/misc-tests/025-zstd-compression/test.sh
index 860685a5..ef5045f5 100755
--- a/tests/misc-tests/025-zstd-compression/test.sh
+++ b/tests/misc-tests/025-zstd-compression/test.sh
@@ -29,7 +29,7 @@ run_check_stdout "$TOP/btrfs" inspect-internal dump-super -f "$image" \
 	|| _fail "btrfs inspect-internal dump-super no incompat COMPRESS_ZSTD"
 
 # Create a temporary directory and restore the filesystem
-restore_tmp=$(mktemp --tmpdir -d btrfs-progs-restore.XXXXXX)
+restore_tmp=$(_mktemp_dir restore)
 run_check "$TOP/btrfs" restore "$image" "$restore_tmp"
 
 # Expect 3 files
diff --git a/tests/misc-tests/048-image-restore-mount/test.sh b/tests/misc-tests/048-image-restore-mount/test.sh
index f2e29122..21fc56fb 100755
--- a/tests/misc-tests/048-image-restore-mount/test.sh
+++ b/tests/misc-tests/048-image-restore-mount/test.sh
@@ -10,7 +10,7 @@ check_prereq btrfs
 
 prepare_test_dev
 
-tmp=$(mktemp -d --tmpdir btrfs-progs-image.XXXXXX)
+tmp=$(_mktemp_dir image)
 
 run_check_mkfs_test_dev
 run_check "$TOP/btrfs-image" "$TEST_DEV" "$tmp/dump"
diff --git a/tests/mkfs-tests/001-basic-profiles/test.sh b/tests/mkfs-tests/001-basic-profiles/test.sh
index 221e6ad3..e9d6bea9 100755
--- a/tests/mkfs-tests/001-basic-profiles/test.sh
+++ b/tests/mkfs-tests/001-basic-profiles/test.sh
@@ -13,7 +13,7 @@ test_get_info()
 {
 	local tmp_out
 
-	tmp_out=$(mktemp --tmpdir btrfs-progs-mkfs-get-info.XXXXXX)
+	tmp_out=$(_mktemp mkfs-get-info)
 	run_check $SUDO_HELPER "$TOP/btrfs" inspect-internal dump-super "$dev1"
 	run_check $SUDO_HELPER "$TOP/btrfs" check "$dev1"
 
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 b86cc402..fbab9cc1 100755
--- a/tests/mkfs-tests/009-special-files-for-rootdir/test.sh
+++ b/tests/mkfs-tests/009-special-files-for-rootdir/test.sh
@@ -20,7 +20,7 @@ prepare_test_dev
 check_global_prereq mknod
 check_global_prereq dd
 
-tmp=$(mktemp -d --tmpdir btrfs-progs-mkfs-rootdir.XXXXXX)
+tmp=$(_mktemp_dir mkfs-rootdir)
 
 run_check mkdir "$tmp/dir"
 run_check mkdir -p "$tmp/dir/in/dir"
diff --git a/tests/mkfs-tests/011-rootdir-create-file/test.sh b/tests/mkfs-tests/011-rootdir-create-file/test.sh
index 76872775..d7524e23 100755
--- a/tests/mkfs-tests/011-rootdir-create-file/test.sh
+++ b/tests/mkfs-tests/011-rootdir-create-file/test.sh
@@ -7,9 +7,9 @@ source "$TEST_TOP/common"
 
 check_prereq mkfs.btrfs
 
-tmp=$(mktemp -d --tmpdir btrfs-progs-mkfs-rootdir.XXXXXX)
+tmp=$(_mktemp_dir mkfs-rootdir)
 # we can't use TEST_DEV, a file is needed
-img=$(mktemp btrfs-progs-mkfs-rootdir.XXXXXXX)
+img=$(_mktemp mkfs-rootdir)
 run_check "$TOP/mkfs.btrfs" -f --rootdir "$INTERNAL_BIN/Documentation/" "$img"
 
 rm -rf -- "$img"
diff --git a/tests/mkfs-tests/012-rootdir-no-shrink/test.sh b/tests/mkfs-tests/012-rootdir-no-shrink/test.sh
index 04efb86a..6ef401d5 100755
--- a/tests/mkfs-tests/012-rootdir-no-shrink/test.sh
+++ b/tests/mkfs-tests/012-rootdir-no-shrink/test.sh
@@ -9,7 +9,7 @@ setup_root_helper
 
 fs_size=$((512 * 1024 * 1024))
 bs=$((1024 * 1024))
-tmp=$(mktemp -d --tmpdir btrfs-progs-mkfs-rootdir.XXXXXX)
+tmp=$(_mktemp_dir mkfs-rootdir)
 
 prepare_test_dev "$fs_size"
 
diff --git a/tests/mkfs-tests/014-rootdir-inline-extent/test.sh b/tests/mkfs-tests/014-rootdir-inline-extent/test.sh
index 5c172a27..7472dc5f 100755
--- a/tests/mkfs-tests/014-rootdir-inline-extent/test.sh
+++ b/tests/mkfs-tests/014-rootdir-inline-extent/test.sh
@@ -8,7 +8,7 @@ check_prereq mkfs.btrfs
 
 prepare_test_dev
 
-tmp=$(mktemp -d --tmpdir btrfs-progs-mkfs-rootdir.XXXXXX)
+tmp=$(_mktemp_dir mkfs-rootdir)
 
 pagesize=$(getconf PAGESIZE)
 create_file()
diff --git a/tests/mkfs-tests/016-rootdir-bad-symbolic-link/test.sh b/tests/mkfs-tests/016-rootdir-bad-symbolic-link/test.sh
index 7dd47026..8f0d861e 100755
--- a/tests/mkfs-tests/016-rootdir-bad-symbolic-link/test.sh
+++ b/tests/mkfs-tests/016-rootdir-bad-symbolic-link/test.sh
@@ -10,7 +10,7 @@ source "$TEST_TOP/common"
 check_prereq mkfs.btrfs
 prepare_test_dev
 
-tmp=$(mktemp -d --tmpdir btrfs-progs-mkfs-rootdir.XXXXXX)
+tmp=$(_mktemp_dir mkfs-rootdir)
 
 non_existing="/no/such/file$RANDOM$RANDOM"
 
diff --git a/tests/mkfs-tests/021-rfeatures-quota-rootdir/test.sh b/tests/mkfs-tests/021-rfeatures-quota-rootdir/test.sh
index 7ad4910f..06de2cae 100755
--- a/tests/mkfs-tests/021-rfeatures-quota-rootdir/test.sh
+++ b/tests/mkfs-tests/021-rfeatures-quota-rootdir/test.sh
@@ -15,7 +15,7 @@ prepare_test_dev
 check_global_prereq mknod
 check_global_prereq dd
 
-tmp=$(mktemp -d --tmpdir btrfs-progs-mkfs-rootdir.XXXXXX)
+tmp=$(_mktemp_dir mkfs-rootdir)
 
 run_check mkdir "$tmp/dir"
 run_check mkdir -p "$tmp/dir/in/dir"
diff --git a/tests/mkfs-tests/022-rootdir-size/test.sh b/tests/mkfs-tests/022-rootdir-size/test.sh
index 517417fb..9a188ada 100755
--- a/tests/mkfs-tests/022-rootdir-size/test.sh
+++ b/tests/mkfs-tests/022-rootdir-size/test.sh
@@ -10,7 +10,7 @@ source "$TEST_TOP/common"
 check_prereq mkfs.btrfs
 prepare_test_dev
 
-tmp=$(mktemp -d --tmpdir btrfs-progs-mkfs-rootdir.XXXXXX)
+tmp=$(_mktemp_dir mkfs-rootdir)
 
 fallocate -l 128M $tmp/large_file