diff --git a/tests/t/cleanup.t b/tests/t/cmd_cleanup.t
similarity index 100%
rename from tests/t/cleanup.t
rename to tests/t/cmd_cleanup.t
diff --git a/tests/t/help.t b/tests/t/cmd_help.t
similarity index 100%
rename from tests/t/help.t
rename to tests/t/cmd_help.t
diff --git a/tests/t/prepare.t b/tests/t/cmd_prepare.t
similarity index 100%
rename from tests/t/prepare.t
rename to tests/t/cmd_prepare.t
diff --git a/tests/t/run.t b/tests/t/cmd_run.t
similarity index 100%
rename from tests/t/run.t
rename to tests/t/cmd_run.t
diff --git a/tests/t/version.t b/tests/t/cmd_version.t
similarity index 100%
rename from tests/t/version.t
rename to tests/t/cmd_version.t
diff --git a/tests/t/commands.t b/tests/t/commands.t
index 1dbc621..0827f96 100644
--- a/tests/t/commands.t
+++ b/tests/t/commands.t
@@ -1,6 +1,6 @@
   $ commands=$(sysbench help | grep 'Commands:' | cut -d ' ' -f 2-)
   $ for cmd in $commands; do
-  > if [ ! -r ${SBTEST_SUITEDIR}/${cmd}.t ]
+  > if [ ! -r ${SBTEST_SUITEDIR}/cmd_${cmd}.t ]
   > then
   >   echo "Cannot find test(s) for 'sysbench $cmd'!"
   >   exit 1