diff --git a/.travis.yml b/.travis.yml
index 3a38e5a..02667b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,33 +1,36 @@
-language: php
-
-php:
-    - 5.3
-    - 5.4
-    - 5.5
-    - 5.6
-    - 7.0
+# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details
 
 sudo: false
 
+language: php
+
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+
 env:
-    - DB=MYSQL CORE_RELEASE=3.1
-
-before_script:
-    - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
-    - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
-    - cd ~/builds/ss
-
-script:
-    - vendor/bin/phpunit --coverage-clover coverage.clover tagfield/tests
-    - wget https://scrutinizer-ci.com/ocular.phar
-    - git remote rm origin
-    - git remote add origin git@github.com:silverstripe-labs/silverstripe-tagfield.git
-    - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
-
-branches:
-    only:
-        - master
+  - DB=MYSQL CORE_RELEASE=3.2
 
 matrix:
-    allow_failures:
-        - php: 7.0
+  include:
+    - php: 5.6
+      env: DB=MYSQL CORE_RELEASE=3
+    - php: 5.6
+      env: DB=MYSQL CORE_RELEASE=3.1
+    - php: 5.6
+      env: DB=PGSQL CORE_RELEASE=3.2
+  allow_failures:
+    - php: 7.0
+
+before_script:
+  - composer self-update || true
+  - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
+  - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
+  - cd ~/builds/ss
+  - composer install
+
+script:
+  - vendor/bin/phpunit tagfield/tests