diff --git a/test/run-test.cmd b/test/run-test.cmd
index 22d39896..79117770 100644
--- a/test/run-test.cmd
+++ b/test/run-test.cmd
@@ -1,4 +1,4 @@
-@echo off
+@echo on
 IF %1.==. GOTO NoOS
 SET OS=%1
 
@@ -6,6 +6,11 @@ SET OS=%1
 IF %2.==. GOTO NoCmd
 SET COMMAND=%2 %3
 
+:CheckBats
+IF NOT %3.==. GOTO CheckAlias
+SET COMMAND=bats %2
+IF NOT "%COMMAND:~5,12%"=="/getssl/test" SET COMMAND=bats /getssl/test/%2
+
 :CheckAlias
 REM check if OS *contains* staging
 SET GETSSL_IDN_HOST=%OS%.xn--t-r1a81lydm69gz81r.test