diff --git a/bin/robot b/bin/robot
index 195a6b3dd..0347f92b1 100755
--- a/bin/robot
+++ b/bin/robot
@@ -1,11 +1,11 @@
-#!/bin/bash -e
-
+#!/bin/bash
 #
 # Build and run everything for automatic tests 
 #
+set -o pipefail
 
-# cd to current script directory
-cd "$(dirname "$0")"
+# cd to Rails root directory
+cd "$(dirname "$0")"; cd ..
 
 git pull origin master
 bundle install --deployment 
@@ -27,6 +27,5 @@ echo "END_OF_RUBOCOP_RESULTS"
 
 # run tests 
 echo "TEST_RESULTS"
-RAILS_ENV=test bundle exec rake test:other
+RAILS_ENV=test bundle exec rake test
 echo "END_OF_TEST_RESULTS"
-