diff --git a/.travis.yml b/.travis.yml
index ad09f4b..7a1e097 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ php:
 
 env:
   global:
-    - DB="POSTGRESQL"
+    - DB="PGSQL"
     - CORE_RELEASE="4"
 
 before_script:
@@ -24,7 +24,7 @@ before_script:
 
 # Install composer dependencies
   - composer install --prefer-dist
-  - composer require --prefer-dist --no-update symfony/config:^3.2 silverstripe/framework:4.0.x-dev silverstripe/siteconfig:4.0.x-dev silverstripe/config:1.0.x-dev silverstripe/admin:1.0.x-dev silverstripe/assets:1.0.x-dev silverstripe/versioned:1.0.x-dev
+  - composer require --prefer-dist --no-update symfony/config:^3.2 silverstripe/framework:4.0.x-dev silverstripe/cms:4.0.x-dev silverstripe/siteconfig:4.0.x-dev silverstripe/config:1.0.x-dev silverstripe/admin:1.0.x-dev silverstripe/assets:1.0.x-dev silverstripe/versioned:1.0.x-dev
   - composer update
 
 script:
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e5fd779..2266f57 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,4 +1,4 @@
-<phpunit bootstrap="framework/tests/bootstrap.php" colors="true">
+<phpunit bootstrap="cms/tests/bootstrap.php" colors="true">
 
 	<testsuite name="Default">
 		<directory>tests</directory>
diff --git a/tests/PostgreSQLDatabaseTest.php b/tests/PostgreSQLDatabaseTest.php
index 947c99e..fe023b7 100644
--- a/tests/PostgreSQLDatabaseTest.php
+++ b/tests/PostgreSQLDatabaseTest.php
@@ -11,6 +11,8 @@ use SilverStripe\PostgreSQL\PostgreSQLDatabase;
  */
 class PostgreSQLDatabaseTest extends SapphireTest
 {
+    protected $usesDatabase = true;
+
     public function testReadOnlyTransaction()
     {
         if (