diff --git a/.travis.yml b/.travis.yml
index 31a63d87c..12a247654 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,15 +55,8 @@ jobs:
       env: DB=sqlite DEPENDENCIES=low
       install: travis_retry composer update --prefer-dist --prefer-lowest
 
-    - stage: Lint
-      env: DB=none
-      before_script:
-        - echo "extension=redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-        - travis_retry composer require --dev --prefer-dist --prefer-stable phpstan/phpstan:^0.8 symfony/console:^3.0
-      script: vendor/bin/phpstan analyse -l 1 -c phpstan.neon lib
-
-    - stage: Coverage
-      env: DB=sqlite
+    - stage: Test
+      env: DB=sqlite COVERAGE
       before_script:
         - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{.disabled,}
         - if [[ ! $(php -m | grep -si xdebug) ]]; then echo "xdebug required for coverage"; exit 1; fi
@@ -73,12 +66,20 @@ jobs:
         - wget https://scrutinizer-ci.com/ocular.phar
         - php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
 
-    - stage: Benchmark
-      env: DB=none
+    - stage: Code Quality
+      env: DB=none STATIC_ANALYSIS
+      before_script:
+        - echo "extension=redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+        - travis_retry composer require --dev --prefer-dist --prefer-stable phpstan/phpstan:^0.8 symfony/console:^3.0
+      script: vendor/bin/phpstan analyse -l 1 -c phpstan.neon lib
+
+    - stage: Code Quality
+      env: DB=none BENCHMARK
       before_script: wget https://phpbench.github.io/phpbench/phpbench.phar https://phpbench.github.io/phpbench/phpbench.phar.pubkey
       script: php phpbench.phar run -l dots --report=default
 
-    - stage: Coding standard
+    - stage: Code Quality
+      env: DB=none CODING_STANDARDS
       php: nightly
       script:
         - ./vendor/bin/phpcs