diff --git a/common/defrag b/common/defrag
index f5e36fb..f923dc0 100644
--- a/common/defrag
+++ b/common/defrag
@@ -37,7 +37,7 @@ _require_defrag()
 	;;
     esac
 
-    _require_command $DEFRAG_PROG
+    _require_command "$DEFRAG_PROG" defragment
     _require_xfs_io_command "fiemap"
 }
 
diff --git a/common/rc b/common/rc
index 1ed9df5..c1a50f2 100644
--- a/common/rc
+++ b/common/rc
@@ -1299,7 +1299,7 @@ _require_dm_flakey()
 {
     # require SCRATCH_DEV to be a valid block device
     _require_block_device $SCRATCH_DEV
-    _require_command $DMSETUP_PROG
+    _require_command "$DMSETUP_PROG" dmsetup
 
     modprobe dm-flakey >/dev/null 2>&1
     $DMSETUP_PROG targets | grep flakey >/dev/null 2>&1
@@ -2289,7 +2289,7 @@ _require_deletable_scratch_dev_pool()
 _require_btrfs()
 {
 	cmd=$1
-	_require_command $BTRFS_UTIL_PROG btrfs
+	_require_command "$BTRFS_UTIL_PROG" btrfs
 	if [ -z "$1" ]; then
 		return 1;
 	fi
@@ -2302,7 +2302,7 @@ _require_fio()
 {
 	job=$1
 
-	_require_command $FIO_PROG
+	_require_command "$FIO_PROG" fio
 	if [ -z "$1" ]; then
 		return 1;
 	fi
diff --git a/tests/btrfs/003 b/tests/btrfs/003
index d559f8e..9b60ea5 100755
--- a/tests/btrfs/003
+++ b/tests/btrfs/003
@@ -51,7 +51,7 @@ _supported_os Linux
 _require_scratch
 _require_scratch_dev_pool 4
 _require_deletable_scratch_dev_pool
-_require_command $WIPEFS_PROG
+_require_command "$WIPEFS_PROG" wipefs
 
 rm -f $seqres.full
 
diff --git a/tests/btrfs/004 b/tests/btrfs/004
index 1d5b816..b548914 100755
--- a/tests/btrfs/004
+++ b/tests/btrfs/004
@@ -53,7 +53,7 @@ _supported_os Linux
 _require_scratch
 _require_no_large_scratch_dev
 _require_btrfs inspect-internal
-_require_command "/usr/sbin/filefrag"
+_require_command "/usr/sbin/filefrag" filefrag
 
 rm -f $seqres.full
 
diff --git a/tests/btrfs/011 b/tests/btrfs/011
index 0207057..f4f2fbe 100755
--- a/tests/btrfs/011
+++ b/tests/btrfs/011
@@ -63,7 +63,7 @@ _need_to_be_root
 _supported_fs btrfs
 _require_scratch_nocheck
 _require_scratch_dev_pool 4
-_require_command $BTRFS_SHOW_SUPER_PROG btrfs-show-super
+_require_command "$BTRFS_SHOW_SUPER_PROG" btrfs-show-super
 
 rm -f $seqres.full
 rm -f $tmp.tmp
diff --git a/tests/btrfs/012 b/tests/btrfs/012
index 9e3f991..d513759 100755
--- a/tests/btrfs/012
+++ b/tests/btrfs/012
@@ -57,9 +57,9 @@ _require_scratch_nocheck
 BTRFS_CONVERT_PROG="`set_prog_path btrfs-convert`"
 E2FSCK_PROG="`set_prog_path e2fsck`"
 
-_require_command $BTRFS_CONVERT_PROG btrfs-convert
-_require_command $MKFS_EXT4_PROG mkfs.ext4
-_require_command $E2FSCK_PROG e2fsck
+_require_command "$BTRFS_CONVERT_PROG" btrfs-convert
+_require_command "$MKFS_EXT4_PROG" mkfs.ext4
+_require_command "$E2FSCK_PROG" e2fsck
 
 rm -f $seqres.full
 
diff --git a/tests/btrfs/079 b/tests/btrfs/079
index 202d3e6..4f59ff9 100755
--- a/tests/btrfs/079
+++ b/tests/btrfs/079
@@ -61,7 +61,7 @@ _require_scratch
 _need_to_be_root
 # Since xfs_io's fiemap always use SYNC flag and can't be unset,
 # we must use filefrag to call fiemap without SYNC flag.
-_require_command "/usr/sbin/filefrag"
+_require_command "/usr/sbin/filefrag" filefrag
 _require_xfs_io_command "falloc"
 
 filesize=$((10 * 1024 * 1024 * 1024)) #10G size
diff --git a/tests/ext4/004 b/tests/ext4/004
index 68f02b6..595cd7c 100755
--- a/tests/ext4/004
+++ b/tests/ext4/004
@@ -72,8 +72,8 @@ _supported_os Linux
 _require_test
 _require_scratch
 
-_require_command $DUMP_PROG
-_require_command $RESTORE_PROG
+_require_command "$DUMP_PROG" dump
+_require_command "$RESTORE_PROG" restore
 
 rm -f $seqres.full
 echo "Silence is golden"
diff --git a/tests/xfs/094 b/tests/xfs/094
index cb27559..cee42d6 100755
--- a/tests/xfs/094
+++ b/tests/xfs/094
@@ -46,7 +46,7 @@ _supported_fs xfs
 _supported_os IRIX Linux
 _require_realtime
 _require_scratch
-_require_command $XFS_IO_PROG xfs_io
+_require_command "$XFS_IO_PROG" xfs_io
 
 _filter_realtime_flag()
 {
diff --git a/tests/xfs/103 b/tests/xfs/103
index 113f643..cbe884f 100755
--- a/tests/xfs/103
+++ b/tests/xfs/103
@@ -66,7 +66,7 @@ _filter_noymlinks_flag()
 # real QA test starts here
 _supported_os Linux IRIX
 _supported_fs xfs
-_require_command $XFS_IO_PROG xfs_io
+_require_command "$XFS_IO_PROG" xfs_io
 _require_scratch
 
 _create_scratch
diff --git a/tests/xfs/122 b/tests/xfs/122
index 8f1d5b4..682ffb4 100755
--- a/tests/xfs/122
+++ b/tests/xfs/122
@@ -39,7 +39,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux
-_require_command $INDENT_PROG "indent"
+_require_command "$INDENT_PROG" indent
 
 # filter out known changes to xfs type sizes
 _type_size_filter()
diff --git a/tests/xfs/195 b/tests/xfs/195
index 76f130e..21fcb00 100755
--- a/tests/xfs/195
+++ b/tests/xfs/195
@@ -65,7 +65,7 @@ _supported_os Linux
 
 _require_test
 _require_user
-_require_command $XFSDUMP_PROG xfsdump
+_require_command "$XFSDUMP_PROG" xfsdump
 
 echo "Preparing subtree"
 mkdir $TEST_DIR/d
