diff --git a/.travis.yml b/.travis.yml
index 0b95356..9ae210d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,9 +16,17 @@ matrix:
       env: DB=SQLITE3 CORE_RELEASE=4.0
 
 before_script:
-  - git clone git://github.com/silverstripe/silverstripe-travis-support.git ~/travis-support
-  - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require phpunit/php-file-iterator:1.3.4
-  - cd ~/builds/ss
+  # Init PHP
+  - composer self-update || true
+  - phpenv rehash
+  - phpenv config-rm xdebug.ini
+  
+  # Install composer dependencies
+  - composer validate
+  - composer require --no-update silverstripe/recipe-framework:1.0.x-dev
+  - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.0.x-dev --prefer-dist; fi
+  - if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.1.x-dev --prefer-dist; fi
+  - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
 
 script:
-  - vendor/bin/phpunit vendor/undefinedoffset/sortablegridfield/tests
\ No newline at end of file
+  - vendor/bin/phpunit
\ No newline at end of file
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000..728ef73
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,5 @@
+<phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
+    <testsuite name="Default">
+        <directory>tests/</directory>
+    </testsuite>
+</phpunit>