--- a/src/cm/scripts/test-suite/start-test-suite.sh	Thu Mar 06 21:49:28 2014 +0000
+++ b/src/cm/scripts/test-suite/start-test-suite.sh	Fri Mar 07 09:36:04 2014 +0100
@@ -1,5 +1,17 @@
 #!/bin/bash
 
-export CHROME_BIN=`whereis chromium | sed -r 's/[^ ]* ([^ ]*).*/\1/g' -`
-karma start
+export CHROME_BIN= `which chromium`
+if [ -z "$CHROME_BIN" ]; then
+    export CHROME_BIN=`which chrome`
+fi
+export PHANTOMJS_BIN=`which phantomjs`
 
+if [ -x ./node_modules/.bin/karma ]; then
+   KARMA=./node_modules/.bin/karma
+else
+   KARMA=`which karma`
+fi
+
+"$KARMA" start
+
+