diff --git a/.travis.yml b/.travis.yml
index 2569b44ec39e83..87f4c38687be86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,13 @@ language: cpp
 cache: ccache
 os: linux
 dist: xenial
+stages:
+  - check
+  - test
 matrix:
   include:
     - name: "First commit message adheres to guidelines at <a href=\"https://goo.gl/p2fr5Q\">https://goo.gl/p2fr5Q</a>"
+      stage: check
       if: type = pull_request
       language: node_js
       node_js: "node"
@@ -13,13 +17,27 @@ matrix:
             bash -x tools/lint-pr-commit-message.sh ${TRAVIS_PULL_REQUEST};
           fi
     - name: "Linter"
+      stage: check
       language: node_js
       node_js: "node"
-      env:
-        - NODE=$(which node)
       script:
-        - make lint
+        - NODE=$(which node) make lint
+    - name: "Prepare ccache"
+      stage: check
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-6
+      install:
+        - export CC='ccache gcc-6' CXX='ccache g++-6' JOBS=2
+        - ./configure
+        - make -j2 V=
+      script:
+        - true
     - name: "Test Suite"
+      stage: test
       addons:
         apt:
           sources:
@@ -31,4 +49,4 @@ matrix:
         - ./configure
         - make -j2 V=
       script:
-        - PARALLEL_ARGS='--flaky-tests=skip' make -j1 test
+        - CI_JS_SUITES='--flaky-tests=skip default' make -j1 test