diff --git a/.travis.yml b/.travis.yml
index 8fd2de7..e16aa32 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,43 +1,34 @@
-# See https://github.com/silverstripe/silverstripe-travis-support for setup details
-
 language: php
 
-sudo: false
-
-php:
-  - 5.6
-  - 7.0
-  - 7.1
-
 env:
-  - DB=MYSQL CORE_RELEASE=4
+  global:
+    - COMPOSER_ROOT_VERSION="3.0.x-dev"
 
 matrix:
   include:
     - php: 5.6
-      env: DB=MYSQL CORE_RELEASE=4
-    - php: 5.6
-      env: DB=MYSQL CORE_RELEASE=4 QUEUEDJOBS=1
+      env: DB=MYSQL PHPCS_TEST=1 PHPUNIT_TEST=1
     - php: 7.0
-      env: DB=MYSQL CORE_RELEASE=4
-    - php: 7.0
-    #   env: DB=MYSQL CORE_RELEASE=4 SUBSITES=1
-    - php: 7.0
-      env: DB=MYSQL CORE_RELEASE=4 QUEUEDJOBS=1
+      env: DB=MYSQL PHPUNIT_TEST=1
     - php: 7.1
-      env: DB=MYSQL CORE_RELEASE=4
-    - php: 7.1
-    #   env: DB=MYSQL CORE_RELEASE=4 SUBSITES=1
-    - php: 7.1
-      env: DB=MYSQL CORE_RELEASE=4 QUEUEDJOBS=1
+      env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1
+    - php: 7.2
+      env: DB=MYSQL PHPUNIT_TEST=1
 
 before_script:
-  - composer self-update || true
-  - git clone git://github.com/silverstripe/silverstripe-travis-support.git ~/travis-support
-  - "if [ \"$SUBSITES\" = \"\" -a \"$QUEUEDJOBS\" = \"\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss; fi"
-#  - "if [ \"$SUBSITES\" = \"1\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require silverstripe/subsites; fi"
-  - "if [ \"$QUEUEDJOBS\" = \"1\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require silverstripe/queuedjobs; fi"
-  - cd ~/builds/ss
+  - phpenv rehash
+  - phpenv config-rm xdebug.ini
+
+  - composer validate
+  - composer require --no-update symbiote/silverstripe-queuedjobs ^4.0
+  # todo: Add Subsites in
+  - composer require --no-update silverstripe/installer 4.0.x-dev
+  - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
 
 script:
-  - vendor/bin/phpunit fulltextsearch/tests/
+  - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi
+  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; fi
+  - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs --standard=vendor/silverstripe/framework/phpcs.xml.dist code tests; fi
+
+after_success:
+  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi
diff --git a/_config.php b/_config.php
index a1de033..118255b 100644
--- a/_config.php
+++ b/_config.php
@@ -1,4 +1,7 @@
 <?php
+
 use SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater;
-global $databaseConfig;
-if (isset($databaseConfig['type'])) SearchUpdater::bind_manipulation_capture();
+
+if (isset($databaseConfig['type'])) {
+    SearchUpdater::bind_manipulation_capture();
+}
diff --git a/codecov.yml b/codecov.yml
new file mode 100644
index 0000000..69cb760
--- /dev/null
+++ b/codecov.yml
@@ -0,0 +1 @@
+comment: false
diff --git a/composer.json b/composer.json
index 3990fd4..2c1349c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,8 @@
 {
     "name": "silverstripe/fulltextsearch",
     "description": "Adds support for Fulltext Search engines like Sphinx and Solr to SilverStripe CMS",
-    "type": "silverstripe-module",
+    "type": "silverstripe-vendormodule",
+    "license": "BSD-3-Clause",
     "keywords": [
         "silverstripe",
         "sphinx",
@@ -20,12 +21,13 @@
         }
     ],
     "require": {
-        "silverstripe/framework": "4.0.x-dev",
+        "silverstripe/framework": "^4.0",
         "monolog/monolog": "~1.15"
     },
     "require-dev": {
-        "silverstripe/cms": "4.0.x-dev",
-        "phpunit/phpunit": "*@stable"
+        "silverstripe/cms": "^4.0",
+        "phpunit/phpunit": "^5.7",
+        "squizlabs/php_codesniffer": "^3.0"
     },
     "extra": {
         "branch-alias": {
@@ -36,5 +38,5 @@
         "silverstripe/fulltextsearch-localsolr": "Adds a ready-to-use local Solr server for initial development"
     },
     "minimum-stability": "dev",
-    "license": "BSD-3-Clause"
+    "prefer-stable": "true"
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000..737b400
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,14 @@
+<phpunit bootstrap="vendor/silverstripe/cms/tests/bootstrap.php" colors="true">
+    <testsuite name="Default">
+        <directory>tests/</directory>
+    </testsuite>
+
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">code/</directory>
+            <exclude>
+                <directory suffix=".php">tests/</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>