diff --git a/.travis.yml b/.travis.yml
index 573b8bb..a1e3ecd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,34 +1,38 @@
 # See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details
 
-language: php
-
 sudo: false
 
-php: 
- - 5.4
+language: php
+
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
 
 env:
-  global:
-    - CORE_RELEASE=3
-  matrix:
-    - DB=MYSQL
-    - DB=SQLITE
-    - DB=PGSQL
+  - DB=MYSQL CORE_RELEASE=3.2
 
 matrix:
   include:
-    - php: 5.5
-      env: DB=MYSQL
     - php: 5.6
-      env: DB=MYSQL
-    - php: 5.3
-      env: DB=MYSQL
+      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
 
 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 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 multiform/tests/
+script:
+  - vendor/bin/phpunit multiform/tests
+
+matrix:
+  allow_failures:
+    - php: 7.0