diff --git a/.travis.yml b/.travis.yml
index 7031c42..199b36a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,35 +12,26 @@ env:
         JX/DKOQ3fGUFAgYe5TZJgLt+DYTc+i+JU+2twPOfh98OseFWgRk4SnrbpxtcBYt4I8Iv1o\
         tjdW4P0aAGAvA1YYopGE70+WTrqixeY=\
       "
-jobs:
-  include:
-    - stage: Test
-      script: script/test
-    - script: script/build
-      stage: Build
-      env:
-        - DOCKER_REPO=jekyll:pages
-        - DOCKER_REPO=jekyll:3.3.0
-        - DOCKER_REPO=jekyll:3.3.1
-        - DOCKER_REPO=jekyll:3.4.0
-        - DOCKER_REPO=jekyll:3.4.2
-        - DOCKER_REPO=jekyll:3.4.3
-        - DOCKER_REPO=jekyll:latest
-        - DOCKER_REPO=jekyll:stable
-        - DOCKER_REPO=jekyll:3.4
-        - DOCKER_REPO=jekyll:3
-        - DOCKER_REPO=builder:pages
-        - DOCKER_REPO=builder:3.3.0
-        - DOCKER_REPO=builder:3.3.1
-        - DOCKER_REPO=builder:3.4.0
-        - DOCKER_REPO=builder:3.4.2
-        - DOCKER_REPO=builder:3.4.3
-        - DOCKER_REPO=builder:latest
-        - DOCKER_REPO=builder:stable
-        - DOCKER_REPO=builder:3.4
-        - DOCKER_REPO=builder:3
-    - script: script/deploy
-      stage: Deploy
-      env:
-        - DOCKER_REPO=jekyll
-        - DOCKER_REPO=builder
+  matrix:
+    - DOCKER_REPO=jekyll:pages
+    - DOCKER_REPO=builder:pages
+    - DOCKER_REPO=jekyll:3.3.0
+    - DOCKER_REPO=builder:3.3.0
+    - DOCKER_REPO=jekyll:3.3.1
+    - DOCKER_REPO=builder:3.3.1
+    - DOCKER_REPO=jekyll:3.4.0
+    - DOCKER_REPO=builder:3.4.0
+    - DOCKER_REPO=jekyll:3.4.1
+    - DOCKER_REPO=builder:3.4.1
+    - DOCKER_REPO=jekyll:3.4.2
+    - DOCKER_REPO=builder:3.4.2
+    - DOCKER_REPO=jekyll:3.4.3
+    - DOCKER_REPO=builder:3.4.3
+    - DOCKER_REPO=jekyll:latest
+    - DOCKER_REPO=builder:latest
+    - DOCKER_REPO=jekyll:stable
+    - DOCKER_REPO=builder:stable
+    - DOCKER_REPO=jekyll:3.4
+    - DOCKER_REPO=builder:3.4
+    - DOCKER_REPO=jekyll:3
+    - DOCKER_REPO=builder:3
diff --git a/script/ci b/script/ci
new file mode 100755
index 0000000..d77516b
--- /dev/null
+++ b/script/ci
@@ -0,0 +1,8 @@
+#!/bin/bash -l
+[ "$DEBUG" = "true" ] && set -x
+set -e
+
+script/install
+script/test
+script/build
+script/deploy
diff --git a/script/test b/script/test
index 5363f55..60ea59d 100755
--- a/script/test
+++ b/script/test
@@ -2,7 +2,6 @@
 [ "$DEBUG" = "true" ] && set -x
 set -e
 
-script/install
 echo "Skipping tests."
 echo "There are currently not tests."
 exit 0