diff --git a/scripts/ci.sh b/scripts/ci.sh
index 1ab8db392..f041d619c 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -54,54 +54,67 @@ else
 fi
 
 if [[ "$NODE_UNIT" != "0" ]]; then
-  if [[ -n "$JENKINS" ]]; then
-    ./node_modules/.bin/mocha test/unit/test_*.js \
-      --require should \
-      --reporter ../../../test/utils/jenkins-reporter.js \
-      2> test/junit-node-unit.xml
-  else
-    grunt_ jshint mochacov:unit
-  fi
+  group "start:unit_tests"
+    if [[ -n "$JENKINS" ]]; then
+      MOCHA_EXE="./node_modules/.bin/mocha test/unit/test_*.js \
+        --require should \
+        --reporter ../../../test/utils/jenkins-reporter.js"
+      echo "\$ $MOCHA_EXE"
+
+      $MOCHA_EXE 2> test/junit-node-integration.xml
+
+    else
+      grunt_ jshint mochacov:unit
+    fi
+  group "end:unit_tests"
 fi
 
 if [[ "$NODE_INTEGRATION" != "0" ]]; then
-  group "start:generate_tests"
+  group "start:generate tests"
     call node scripts/generate --no-api
-  group "end:generate_tests"
+  group "end:generate tests"
 
-  if [[ -n "$JENKINS" ]]; then
-    # convert TESTING_BRANCH into BRANCH_SUFFIX
-    if [[ $TESTING_BRANCH = 'master' ]]; then
-      BRANCH_SUFFIX=''
+  group "start:integration tests"
+    if [[ -n "$JENKINS" ]]; then
+      # convert TESTING_BRANCH into BRANCH_SUFFIX
+      if [[ $TESTING_BRANCH = 'master' ]]; then
+        BRANCH_SUFFIX=''
+      else
+        BRANCH_SUFFIX=${TESTING_BRANCH//./_}
+      fi
+
+      # find value of ES_PORT
+      if [[ -n "$es_port" ]]; then
+        # jenkins
+        ES_PORT=$es_port
+      else
+        ES_PORT=9200
+      fi
+
+      MOCHA_EXE="./node_modules/.bin/mocha test/integration/yaml_suite/index${BRANCH_SUFFIX}.js \
+        --require should \
+        --host localhost \
+        --port $ES_PORT \
+        --reporter ../../../test/utils/jenkins-reporter.js"
+      echo "\$ $MOCHA_EXE"
+
+      $MOCHA_EXE 2> test/junit-node-integration.xml
     else
-      BRANCH_SUFFIX=${TESTING_BRANCH//./_}
+      manage_es start $TESTING_BRANCH $ES_RELEASE
+      grunt_ mochacov:integration_$TESTING_BRANCH
+      manage_es stop $TESTING_BRANCH $ES_RELEASE
     fi
-
-    # find value of ES_PORT
-    if [[ -n "$es_port" ]]; then
-      # jenkins
-      ES_PORT=$es_port
-    else
-      ES_PORT=9200
-    fi
-
-    ./node_modules/.bin/mocha test/integration/yaml_suite/index${BRANCH_SUFFIX}.js \
-      --require should \
-      --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
-    manage_es stop $TESTING_BRANCH $ES_RELEASE
-  fi
+  group "end:integration tests"
 fi
 
 if [[ -n "$TEST_BROWSER" ]]; then
-  grunt_ browser_clients:build run:browser_test_server saucelabs-mocha:${TEST_BROWSER}
+  group "start:browser tests"
+    grunt_ browser_clients:build run:browser_test_server saucelabs-mocha:${TEST_BROWSER}
+  group "end:browser tests"
 fi
 
 if [[ "$COVERAGE" == "1" ]]; then
-  grunt_ mochacov:ship_coverage
+  group "start:ship coverage"
+    grunt_ mochacov:ship_coverage
+  group "stop:ship coverage"
 fi