diff --git a/.scrutinizer.yml b/.scrutinizer.yml
new file mode 100644
index 0000000..b3ec7d3
--- /dev/null
+++ b/.scrutinizer.yml
@@ -0,0 +1,12 @@
+inherit: true
+
+tools:
+  external_code_coverage: true
+
+checks:
+  php:
+    code_rating: true
+    duplication: true
+
+filter:
+  paths: [code/*, tests/*]
diff --git a/.travis.yml b/.travis.yml
index 9acf8e4..e4d08e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,11 @@ language: php
 
 sudo: false
 
-php: 
- - 5.4
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
 
 env:
  - DB=MYSQL CORE_RELEASE=3
@@ -13,14 +16,27 @@ env:
  - DB=PGSQL CORE_RELEASE=3.1
 
 matrix:
-  include:
-    - php: 5.3
-      env: DB=MYSQL CORE_RELEASE=3.1
+  exclude:
+    - php: 5.4
+      env: DB=MYSQL CORE_RELEASE=3
+    - php: 5.5
+      env: DB=MYSQL CORE_RELEASE=3
+    - php: 5.6
+      env: DB=MYSQL CORE_RELEASE=3
+    - php: 5.4
+      env: DB=PGSQL CORE_RELEASE=3.1
+    - php: 5.5
+      env: DB=PGSQL CORE_RELEASE=3.1
+    - php: 5.6
+      env: DB=PGSQL 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
+  - 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: 
- - phpunit userforms/tests/
+  - phpunit --coverage-clover userforms/coverage.clover userforms/tests
+  - cd userforms
+  - wget https://scrutinizer-ci.com/ocular.phar
+  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover