diff --git a/.travis.yml b/.travis.yml
index 939dd84..f20b057 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,39 +1,36 @@
-language: php
+# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details
 
 sudo: false
 
-addons:
-  apt:
-    packages:
-      - tidy
+language: php
+
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
 
 env:
-  global:
-    - DB=MYSQL CORE_RELEASE=3.1
+  - DB=MYSQL CORE_RELEASE=3.2
 
 matrix:
-  allow_failures:
-    - php: hhvm-nightly
   include:
     - php: 5.6
-      env: DB=MYSQL
-    - php: 5.5
-      env: DB=MYSQL
-    - php: 5.4
-      env: DB=MYSQL
-    - php: 5.3
-      env: DB=MYSQL
-    - php: hhvm
-      env: DB=MYSQL
-      before_install:
-
+      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:
-  - 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:
-  - vendor/bin/phpunit blog/tests/
+  - vendor/bin/phpunit silverstripe-blog/tests