diff --git a/.travis.yml b/.travis.yml
index 07d66b9fa1..a9e0f9fda8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,15 @@ before_install: skip
 
 jobs:
   include:
+  - stage: Lint
+    os: linux
+    sudo: false
+    dist: trusty
+    go: '1.10'
+    git:
+      submodules: false
+      script:
+        - go run build/ci.go lint
   - stage: Build and test
     os: linux
     dist: trusty
@@ -15,7 +24,9 @@ jobs:
     - sudo chmod 666 /dev/fuse
     - sudo chown root:$USER /etc/fuse.conf
     - go run build/ci.go install
+    - while sleep 540; do echo "[ still running ]"; done &
     - go run build/ci.go test -coverage
+    - kill %1
   - os: linux
     dist: trusty
     go: '1.10'
@@ -24,16 +35,9 @@ jobs:
     - sudo chmod 666 /dev/fuse
     - sudo chown root:$USER /etc/fuse.conf
     - go run build/ci.go install
+    - while sleep 540; do echo "[ still running ]"; done &
     - go run build/ci.go test -coverage
-  - stage: Lint
-    os: linux
-    sudo: false
-    dist: trusty
-    go: '1.10'
-    git:
-      submodules: false
-    script:
-    - go run build/ci.go lint
+    - kill %1
   - stage: Build and push Docker image
     services:
       - docker
@@ -50,8 +54,8 @@ jobs:
     script: bash docker_rebuild.sh
 
 stages:
-  - name: Build and test
   - name: Lint
+  - name: Build and test
   - name: Build and push Docker image
     if: type != pull_request AND branch = master
   - name: Trigger rebuild of infrastructure image