diff --git a/.travis.yml b/.travis.yml
index c4811ab2f..c97ef435c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,16 +3,17 @@ php:
  - 5.3
 
 env:
- - TESTDB=MYSQL
- - TESTDB=PGSQL
+ - TESTDB=MYSQL CORE_RELEASE=2.4
+ - TESTDB=PGSQL CORE_RELEASE=2.4
 
 before_script:
  - phpenv rehash
- - ./tests/travis/before_script ~/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 -c phpunit.xml.dist 
+ - phpunit sapphire/tests
 
 branches:
   except:
diff --git a/tests/travis/_config.php b/tests/travis/_config.php
deleted file mode 100644
index 7b5da0dc3..000000000
--- a/tests/travis/_config.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-global $project;
-$project = 'mysite';
-
-global $database;
-$database = '';
-
-require_once('conf/ConfigureFromEnv.php');
-
-global $databaseConfig;
-$databaseConfig['memory'] = true;
-$databaseConfig['path'] = dirname(dirname(__FILE__)) .'/assets/';
-
-MySQLDatabase::set_connection_charset('utf8');
-
-// Set the current theme. More themes can be downloaded from
-// http://www.silverstripe.org/themes/
-SSViewer::set_theme('blackcandy');
-
-// Enable nested URLs for this site (e.g. page/sub-page/)
-if(class_exists('SiteTree')) SiteTree::enable_nested_urls();
\ No newline at end of file
diff --git a/tests/travis/_manifest_exclude b/tests/travis/_manifest_exclude
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/travis/_ss_environment.php b/tests/travis/_ss_environment.php
deleted file mode 100644
index eb388291e..000000000
--- a/tests/travis/_ss_environment.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php 
-ob_start();
-
-define('SS_ENVIRONMENT_TYPE', 'dev');
-
-/* Database connection */
-$db = getenv('TESTDB');
-switch($db) {
-case "PGSQL";
-	define('SS_DATABASE_CLASS', 'PostgreSQLDatabase');
-	define('SS_DATABASE_USERNAME', 'postgres'); 
-	define('SS_DATABASE_PASSWORD', '');
-	break;
-
-case "MYSQL":
-	define('SS_DATABASE_CLASS', 'MySQLDatabase');
-	define('SS_DATABASE_USERNAME', 'root'); 
-	define('SS_DATABASE_PASSWORD', '');
-	break;
-
-default:
-	define('SS_DATABASE_CLASS', 'SQLitePDODatabase');
-	define('SS_DATABASE_USERNAME', 'root'); 
-	define('SS_DATABASE_PASSWORD', '');
-}
-
-echo SS_DATABASE_CLASS;
-
-define('SS_DATABASE_SERVER', 'localhost'); 
-define('SS_DATABASE_CHOOSE_NAME', true);
-
-
-/* Configure a default username and password to access the CMS on all sites in this environment. */ 
-define('SS_DEFAULT_ADMIN_USERNAME', 'username'); 
-define('SS_DEFAULT_ADMIN_PASSWORD', 'password');
-
-$_FILE_TO_URL_MAPPING[dirname(__FILE__)] = 'http://localhost';
diff --git a/tests/travis/before_script b/tests/travis/before_script
deleted file mode 100755
index 294568525..000000000
--- a/tests/travis/before_script
+++ /dev/null
@@ -1,10 +0,0 @@
-BUILD_DIR=$1
-git clone --depth=100 --branch 2.4 --quiet git://github.com/silverstripe/silverstripe-installer.git $BUILD_DIR
-git clone --depth=100 --branch 2.4 --quiet git://github.com/silverstripe/silverstripe-cms.git $BUILD_DIR/cms
-git clone --depth=100 --branch 1.2 --quiet git://github.com/silverstripe-labs/silverstripe-sqlite3.git $BUILD_DIR/sqlite3
-git clone --depth=100 --branch 1.0 --quiet git://github.com/silverstripe/silverstripe-postgresql.git $BUILD_DIR/postgresql
-cp ./tests/travis/_ss_environment.php $BUILD_DIR
-cp ./tests/travis/_config.php $BUILD_DIR/mysite
-cp -r . $BUILD_DIR/sapphire
-
-cd $BUILD_DIR