diff --git a/.travis.yml b/.travis.yml
index 5d465b3e..fb575486 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,15 +5,7 @@ os:
 node_js:
   - 'stable'
   - 'lts/*'
-before_script:
-  - 'npm install grunt-cli -g'
-  - 'export DISPLAY=:99.0'
-  - 'if [ ${TRAVIS_OS_NAME} = "linux" ]; then sh -e /etc/init.d/xvfb start; fi'
-  - 'sleep 3'
 script:
   - 'npm run lint'
   - 'npm run test'
-  - 'if [ ${TRAVIS_NODE_VERSION} = "stable" ]; then
-      grunt pre-build;
-      npm run test:e2e;
-    fi'
+  - 'if [[ ${TRAVIS_BRAHCN} = "master" && ${TRAVIS_NODE_VERSION} = "stable" ]]; then ./script/e2e-runner.sh; fi'
diff --git a/script/e2e-runner.sh b/script/e2e-runner.sh
new file mode 100755
index 00000000..32a1ffc5
--- /dev/null
+++ b/script/e2e-runner.sh
@@ -0,0 +1,9 @@
+if [[ ${TRAVIS_OS_NAME} = "linux" ]]; then
+  export DISPLAY=:99.0
+  sh -e /etc/init.d/xvfb start;
+  sleep 3
+fi
+
+npm install grunt-cli -g
+grunt pre-build
+npm run test:e2e