diff --git a/.travis.yml b/.travis.yml
index e7a5144b..52484dc6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,27 @@
 language: php
 
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7
-  - hhvm
- 
 matrix:
-    allow_failures:
-        - php: 7
+  fast_finish: true
+  include:
+    - php: 5.3.3
+    - php: 5.3
+    - php: 5.4
+    - php: 5.5
+    - php: 5.6
+      env: CHECK_LINKS=true BUILD_DOCS=true
+    - php: 7
+    - php: hhvm
+  allow_failures:
+    - php: 7
 
-install:
-  - sudo apt-get -y install pypy python-sphinx graphviz
+before_install:
   - composer selfupdate
-  - travis_retry composer update --no-interaction --prefer-source
+
+install:
+  - travis_retry composer install --no-interaction --prefer-source
+  - if [[ "$CHECK_LINKS" == "true" ]]; then sudo apt-get -y install pypy python-sphinx graphviz; fi
 
 script:
-  - cd docs && make linkcheck && cd ..
-  - vendor/bin/phpdoc -d src -t docs-api
   - vendor/bin/phpunit --coverage-text
+  - if [[ "$CHECK_LINKS" == "true" ]]; then cd docs && make linkcheck && cd ..; fi
+  - if [[ "$BUILD_DOCS" == "true" ]]; then vendor/bin/phpdoc -d src -t docs-api; fi