diff --git a/.editorconfig b/.editorconfig
index 47ae637..7d56e29 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,7 +10,7 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[{*.yml,package.json}]
+[{*.yml,*.json}]
 indent_size = 2
 
 # The indent size used in the package.json file cannot be changed:
diff --git a/.travis.yml b/.travis.yml
index c87ed37..52a2866 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,15 +6,25 @@ php:
   - 5.6
 
 env:
-  matrix:
-    - DB=POSTGRESQL CORE_RELEASE=master
+  global:
+    - DB="POSTGRESQL"
+    - CORE_RELEASE="master"
 
 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
+# Init PHP
+  - printf "\n" | pecl install imagick
+  - phpenv rehash
+  - phpenv config-rm xdebug.ini
+  - echo 'memory_limit = 2048M' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+
+# Temporarily update to 1.5.x-dev of composer
+  - composer self-update --snapshot
+
+# 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 update
 
 script:
- - vendor/bin/phpunit framework/tests
+ - vendor/bin/phpunit ./tests
+ - vendor/bin/phpunit ./framework/tests
diff --git a/composer.json b/composer.json
index 67a19f2..cc282d1 100644
--- a/composer.json
+++ b/composer.json
@@ -1,23 +1,26 @@
 {
-	"name": "silverstripe/postgresql",
-	"description": "SilverStripe now has tentative support for PostgreSQL ('Postgres')",
-	"type": "silverstripe-module",
-	"keywords": ["silverstripe", "postgresql", "database"],
-	"authors": [
-		{
-			"name": "Sam Minnée",
-			"email": "sam@silverstripe.com"
-		}
-	],
-	"require": {
-		"silverstripe/framework": "~4.0"
-	},
-	"require-dev": {
-		"phpunit/PHPUnit": "~4.8"
-	},
-	"extra": {
-		"branch-alias": {
-			"dev-master": "2.0.x-dev"
-		}
-	}
+  "name": "silverstripe/postgresql",
+  "description": "SilverStripe now has tentative support for PostgreSQL ('Postgres')",
+  "type": "silverstripe-module",
+  "keywords": ["silverstripe", "postgresql", "database"],
+  "license": "BSD-3-Clause",
+  "authors": [
+    {
+      "name": "Sam Minnée",
+      "email": "sam@silverstripe.com"
+    }
+  ],
+  "require": {
+    "silverstripe/framework": "^4.0@dev"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^5.7"
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-master": "2.0.x-dev"
+    }
+  },
+  "minimum-stability": "dev",
+  "prefer-stable": true
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000..e5fd779
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,16 @@
+<phpunit bootstrap="framework/tests/bootstrap.php" colors="true">
+
+	<testsuite name="Default">
+		<directory>tests</directory>
+	</testsuite>
+
+	<filter>
+		<whitelist addUncoveredFilesFromWhitelist="true">
+			<directory suffix=".php">.</directory>
+			<exclude>
+				<directory suffix=".php">tests/</directory>
+			</exclude>
+		</whitelist>
+	</filter>
+
+</phpunit>