diff --git a/.travis.yml b/.travis.yml
index 339e666..e1fe486 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,28 @@
-language: php
+# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details
 
 sudo: false
 
+language: php
+
 php:
   - 5.5
+  - 5.6
+  - 7.0
 
 env:
-  matrix:
-    - DB=SQLITE CORE_RELEASE=master
+  - DB=SQLITE CORE_RELEASE=master PDO=1
+
+matrix:
+  include:
+    - php: 5.6
+      env: DB=SQLITE CORE_RELEASE=master PDO=0
 
 before_script:
- - composer self-update || true
- - phpenv rehash
- - 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 framework/tests 
+script:
+  - vendor/bin/phpunit framework/tests
diff --git a/composer.json b/composer.json
index 27c5662..c232fdf 100644
--- a/composer.json
+++ b/composer.json
@@ -16,9 +16,14 @@
 	"require": {
 		"silverstripe/framework": "~4.0"
 	},
+	"require-dev": {
+		"phpunit/phpunit": "~4.8"
+	},
 	"extra": {
 		"branch-alias": {
 			"dev-master": "2.0.x-dev"
 		}
-	}
+	},
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }