diff --git a/scripts/test-server.bat b/scripts/test-server.bat
index eb78354..0b7fa66 100644
--- a/scripts/test-server.bat
+++ b/scripts/test-server.bat
@@ -12,8 +12,8 @@ echo Starting JsTestDriver Server (http://code.google.com/p/js-test-driver/)
 echo Please open the following url and capture one or more browsers:
 echo http://localhost:%PORT%/
 
-java -jar "%BASE_DIR%/../test/lib/jstestdriver/JsTestDriver.jar" ^
+java -jar "%BASE_DIR%\..\test\lib\jstestdriver\JsTestDriver.jar" ^
      --port %PORT% ^
      --browserTimeout 20000 ^
-     --config "%BASE_DIR%/../config/jsTestDriver.conf" ^
-     --basePath "%BASE_DIR%/.."
+     --config "%BASE_DIR%\..\config\jsTestDriver.conf" ^
+     --basePath "%BASE_DIR%\.."
diff --git a/scripts/test-server.sh b/scripts/test-server.sh
index e8c2da0..ff38f5e 100755
--- a/scripts/test-server.sh
+++ b/scripts/test-server.sh
@@ -1,10 +1,14 @@
 #!/bin/bash
 
-base_dir=`dirname $0`
-port=9876
+BASE_DIR=`dirname $0`
+PORT=9876
 
 echo "Starting JsTestDriver Server (http://code.google.com/p/js-test-driver/)"
 echo "Please open the following url and capture one or more browsers:"
-echo "http://localhost:$port"
+echo "http://localhost:$PORT"
 
-java -jar "$base_dir/../test/lib/jstestdriver/JsTestDriver.jar" --port $port --browserTimeout 20000 --config "$base_dir/../config/jsTestDriver.conf" --basePath "$base_dir/.."
\ No newline at end of file
+java -jar "$BASE_DIR/../test/lib/jstestdriver/JsTestDriver.jar" \
+     --port $PORT \
+     --browserTimeout 20000 \
+     --config "$BASE_DIR/../config/jsTestDriver.conf" \
+     --basePath "$BASE_DIR/.."
diff --git a/scripts/test.bat b/scripts/test.bat
index 34313d0..21ebcac 100644
--- a/scripts/test.bat
+++ b/scripts/test.bat
@@ -8,7 +8,7 @@ REM - Java (http://www.java.com)
 
 set BASE_DIR=%~dp0
 
-java -jar "%BASE_DIR%/../test/lib/jstestdriver/JsTestDriver.jar" ^
-     --config "%BASE_DIR%/../config/jsTestDriver.conf" ^
-     --basePath "%BASE_DIR%/.." ^
+java -jar "%BASE_DIR%\..\test\lib\jstestdriver\JsTestDriver.jar" ^
+     --config "%BASE_DIR%\..\config\jsTestDriver.conf" ^
+     --basePath "%BASE_DIR%\.." ^
      --tests all
diff --git a/scripts/test.sh b/scripts/test.sh
index 622840b..5b2ce34 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -1,10 +1,8 @@
 #!/bin/bash
 
-base_dir=`dirname $0`
+BASE_DIR=`dirname $0`
 
-tests=$1
-if [[ $tests = "" ]]; then
-  tests="all"
-fi
-
-java -jar "$base_dir/../test/lib/jstestdriver/JsTestDriver.jar" --config "$base_dir/../config/jsTestDriver.conf" --basePath "$base_dir/.."  --tests "$tests"
+java -jar "$BASE_DIR/../test/lib/jstestdriver/JsTestDriver.jar" \
+     --config "$BASE_DIR/../config/jsTestDriver.conf" \
+     --basePath "$BASE_DIR/.." \
+     --tests all