diff --git a/.travis.yml b/.travis.yml
index 95abd8c252..e7e0d77114 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,10 @@ install:
 - sudo apt-get -y install gdb
 
 before_script: "bash -c Installation/travisCI/before_script.sh"
-script: "bash -c Installation/travisCI/script.sh"
+script:
+ - "bash -c Installation/travisCI/build.sh"
+ - "bash -c Installation/travisCI/jslint.sh"
+ - "bash -c Installation/travisCI/tests.sh"
 after_failure: "bash -c Installation/travisCI/after_failure.sh"
 branches:
   only:
diff --git a/Installation/travisCI/script.sh b/Installation/travisCI/build.sh
similarity index 60%
rename from Installation/travisCI/script.sh
rename to Installation/travisCI/build.sh
index e74978c762..d33472e4f3 100755
--- a/Installation/travisCI/script.sh
+++ b/Installation/travisCI/build.sh
@@ -20,11 +20,5 @@ echo "$0: compiling ArangoDB"
 
 make -j2 || exit 1
 
-echo
-echo "$0: testing ArangoDB"
-
-ulimit -c unlimited -S # enable core files
-make jslint unittests-shell-server unittests-shell-server-ahuacatl unittests-shell-server-aql unittests-http-server SKIP_RANGES=1 || exit 1
-
 echo
 echo "$0: done"
diff --git a/Installation/travisCI/jslint.sh b/Installation/travisCI/jslint.sh
new file mode 100755
index 0000000000..adb48289e5
--- /dev/null
+++ b/Installation/travisCI/jslint.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+echo
+echo "$0: linting ArangoDB JS"
+
+ulimit -c unlimited -S # enable core files
+make jslint || exit 1
+
+echo
+echo "$0: done"
diff --git a/Installation/travisCI/tests.sh b/Installation/travisCI/tests.sh
new file mode 100755
index 0000000000..c194055a80
--- /dev/null
+++ b/Installation/travisCI/tests.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+echo
+echo "$0: testing ArangoDB"
+
+ulimit -c unlimited -S # enable core files
+make unittests-shell-server unittests-shell-server-ahuacatl unittests-shell-server-aql unittests-http-server SKIP_RANGES=1 || exit 1
+
+echo
+echo "$0: done"