diff --git a/.travis.yml b/.travis.yml
index d5078bee..421c9295 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,27 @@
 language: php
-sudo: false
-
 php:
   - 5.4
   - 5.5
   - 5.6
   - 7.0
 
+sudo: false
+
 env:
   matrix:
     - DB=mysql
     - DB=pgsql
     - DB=sqlite
 
+cache:
+  directories:
+    - vendor
+    - $HOME/.composer/cache
+
+before_install:
+  - travis_retry composer self-update && composer --version #travis is bad at updating composer
+  - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
+
 install:
   - mkdir -p data/config
   - if [[ "$DB" == "pgsql" ]]; then psql -c "SELECT set_config('log_statement', 'all', false);" -U postgres; fi
@@ -22,10 +31,10 @@ install:
   - if [[ "$DB" == "mysql" ]]; then mysql -e "CREATE DATABASE shimmie;" -uroot; fi
   - if [[ "$DB" == "mysql" ]]; then echo '<?php define("DATABASE_DSN", "mysql:user=root;password=;host=localhost;dbname=shimmie");' > data/config/auto_install.conf.php ; fi
   - if [[ "$DB" == "sqlite" ]]; then echo '<?php define("DATABASE_DSN", "sqlite:shimmie.sqlite");' > data/config/auto_install.conf.php ; fi
-  - wget https://scrutinizer-ci.com/ocular.phar
+  - composer install
+  - php install.php
 
 script:
-  - php install.php
   - phpunit --configuration tests/phpunit.xml --coverage-clover=data/coverage.clover
 
 after_failure:
@@ -40,4 +49,5 @@ after_failure:
   - cat /var/log/postgresql/postgresql*
 
 after_script:
+  - wget https://scrutinizer-ci.com/ocular.phar
   - php ocular.phar code-coverage:upload --format=php-clover data/coverage.clover