diff --git a/package.json b/package.json
index 7294b40..64c9f2b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webrtc-utilities",
-  "version": "0.0.2",
+  "version": "0.0.5",
   "author": "The WebRTC project authors (https://www.webrtc.org/)",
   "description": "WebRTC test framework utilities.",
   "license": "BSD-3-Clause",
@@ -18,7 +18,7 @@
   },
   "scripts": {
     "prepublish": "grunt githooks",
-    "test": "grunt && test/run-tests"
+    "test": "grunt && ./test/start-tests.sh"
   },
    "devDependencies": {
     "grunt": "^0.4.5",
diff --git a/test/run-tests b/src/testrunner/start-tests.sh
similarity index 91%
rename from test/run-tests
rename to src/testrunner/start-tests.sh
index acf5ec2..8b5d51e 100755
--- a/test/run-tests
+++ b/src/testrunner/start-tests.sh
@@ -6,7 +6,7 @@
 #  tree.
 #!/bin/sh
 
-# Run testling with a default set of parameters
+# Run with a default set of parameters
 BINDIR=./browsers/bin
 export BROWSER=${BROWSER-chrome}
 export BVER=${BVER-stable}
diff --git a/test/start-tests.sh b/test/start-tests.sh
new file mode 100755
index 0000000..8b5d51e
--- /dev/null
+++ b/test/start-tests.sh
@@ -0,0 +1,21 @@
+#
+#  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+#
+#  Use of this source code is governed by a BSD-style license
+#  that can be found in the LICENSE file in the root of the source
+#  tree.
+#!/bin/sh
+
+# Run with a default set of parameters
+BINDIR=./browsers/bin
+export BROWSER=${BROWSER-chrome}
+export BVER=${BVER-stable}
+BROWSERBIN=$BINDIR/$BROWSER-$BVER
+if [ ! -x $BROWSERBIN ]; then
+  echo "Installing browser"
+  ./node_modules/travis-multirunner/setup.sh
+fi
+echo "Starting browser"
+PATH=$PATH:./node_modules/.bin
+
+node test/run-tests.js