diff --git a/.travis.yml b/.travis.yml
index 0e31ca980d..380302dbdc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,10 +10,15 @@ before_install:
   - sudo chmod +x /usr/local/bin/yq-3.2.1
   - sudo ln -s /usr/local/bin/yq-3.2.1 /usr/local/bin/yq
   - sudo apt install shellcheck
-script: bash ci/build.sh
 branches:
   only:
   - master
   - /^release-v\d+\.\d+$/
   - /^v\d+\.\d+\.\d+$/
   - /^v\d+\.\d+\.\d+-(alpha|beta|rc)\.\d+$/
+jobs:
+  include:
+    - stage: test
+      script: bash ci/run-tests.sh
+    - stage: build
+      script: bash ci/build.sh
diff --git a/ci/build.sh b/ci/build.sh
index a497d1bca5..f5fdb7a28e 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -246,9 +246,6 @@ function generate_overrides() {
   fi
 }
 
-echo "Running tests"
-./ci/run-tests.sh || (echo "Failed running tests" && exit 1)
-
 # Set up Github
 if [ -n "$GITHUB_TOKEN" ]; then
   set_up_github "${GITHUB_TOKEN}" "$(get_branch_to_checkout)"