diff --git a/scripts/ci.sh b/scripts/ci.sh
index c8a2bdbd1..19be57c67 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -56,9 +56,7 @@ fi
 if [[ "$NODE_UNIT" != "0" ]]; then
   group "start:unit_tests"
     if [[ -n "$JENKINS" ]]; then
-      MOCHA_EXE="./node_modules/.bin/mocha test/unit/test_*.js --reporter ../../../test/utils/jenkins-reporter.js"
-      echo "\$ $MOCHA_EXE"
-      $MOCHA_EXE 2> test/junit-node-unit.xml
+      call "./node_modules/.bin/mocha test/unit/test_*.js --reporter ../../../test/utils/jenkins-reporter.js 2> test/junit-node-unit.xml"
     else
       grunt_ jshint mochacov:unit
     fi
@@ -76,7 +74,7 @@ if [[ "$NODE_INTEGRATION" != "0" ]]; then
       if [[ $TESTING_BRANCH = 'master' ]]; then
         BRANCH_SUFFIX=''
       else
-        BRANCH_SUFFIX=${TESTING_BRANCH//./_}
+        BRANCH_SUFFIX="_${TESTING_BRANCH//./_}"
       fi
 
       # find value of ES_PORT
@@ -87,13 +85,11 @@ if [[ "$NODE_INTEGRATION" != "0" ]]; then
         ES_PORT=9200
       fi
 
-      MOCHA_EXE="./node_modules/.bin/mocha test/integration/yaml_suite/index${BRANCH_SUFFIX}.js \
-        --host localhost \
-        --port $ES_PORT \
-        --reporter ../../../test/utils/jenkins-reporter.js"
-      echo "\$ $MOCHA_EXE"
-
-      $MOCHA_EXE 2> test/junit-node-integration.xml
+      call "./node_modules/.bin/mocha test/integration/yaml_suite/index${BRANCH_SUFFIX}.js
+        --host localhost
+        --port $ES_PORT
+        --reporter ../../../test/utils/jenkins-reporter.js
+        2> test/junit-node-integration.xml"
     else
       manage_es start $TESTING_BRANCH $ES_RELEASE
       grunt_ mochacov:integration_$TESTING_BRANCH