diff --git a/test/run-test.sh b/test/run-test.sh
index caf8ceb..7d4c997 100755
--- a/test/run-test.sh
+++ b/test/run-test.sh
@@ -10,6 +10,14 @@ OS=$1
 if [ $# -gt 1 ]; then
   shift
   COMMAND=$*
+  if [[ $COMMAND != "bats /getssl/test"* ]]; then
+    COMMAND="bats /getssl/test/$COMMAND"
+  elif [[ $COMMAND == /getssl/test* ]]; then
+    COMMAND="bats $COMMAND"
+  fi
+  if [[ $COMMAND != *.bats ]]; then
+    COMMAND="${COMMAND}.bats"
+  fi
 else
   COMMAND="bats /getssl/test --timing"
 fi