diff --git a/.travis.yml b/.travis.yml
index ef73692..8425684 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,36 @@
-language: php
+# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details
 
 sudo: false
 
-php: 
+language: php
+
+php:
   - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
 
 env:
-  - DB=MYSQL CORE_RELEASE=3.1
+  - DB=MYSQL CORE_RELEASE=3.2
 
 matrix:
   include:
-    - php: 5.5
+    - php: 5.6
       env: DB=MYSQL CORE_RELEASE=3
     - php: 5.6
-      env: DB=MYSQL CORE_RELEASE=3.2
-      
+      env: DB=PGSQL CORE_RELEASE=3.1
+    - php: 5.6
+      env: DB=PGSQL CORE_RELEASE=3.3
+    - php: 5.6
+      env: DB=PGSQL CORE_RELEASE=3.4
+  fast_finish: true
+
 before_script:
-  - phpenv rehash
+  - 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:
-  - phpunit gridfieldextensions/tests
+  - vendor/bin/phpunit gridfieldextensions/tests