diff --git a/.travis.yml b/.travis.yml
index 89ec132..6366014 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,13 @@
 language: php
 
+dist: precise
+
 sudo: false
 
+cache:
+  directories:
+    - $HOME/.composer/cache/files
+
 php:
  - 5.6
 
@@ -20,11 +26,12 @@ matrix:
       env: PHPUNIT_TEST=1
 
 before_script:
+  - export PATH=~/.composer/vendor/bin:$PATH
   - composer validate
   - composer install --dev --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 --prefer-dist
+  - composer require --prefer-dist --no-update silverstripe/recipe-core:1.0.x-dev
   - composer update
-  - if [[ $PHPCS_TEST ]]; then pyrus install pear/PHP_CodeSniffer; fi
+  - if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi
   - phpenv rehash
 
 script:
diff --git a/composer.json b/composer.json
index 6fffb96..fab85bd 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
     }
   },
   "autoload-dev": {
-    "psr-0": {
+    "psr-4": {
       "SilverStripe\\BehatExtension\\Tests\\": "tests/php/"
     },
     "classmap": [
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 5ee98b6..2e0ac12 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,5 +1,5 @@
-<phpunit bootstrap="tests/bootstrap.php" colors="true">
+<phpunit colors="true">
 	<testsuite name="Default">
-		<directory>tests</directory>
+		<directory>tests/php</directory>
 	</testsuite>
-</phpunit>
\ No newline at end of file
+</phpunit>
diff --git a/src/Context/BasicContext.php b/src/Context/BasicContext.php
index 0d97ad7..a861b32 100644
--- a/src/Context/BasicContext.php
+++ b/src/Context/BasicContext.php
@@ -6,10 +6,8 @@ use Behat\Behat\Context\Context;
 use Behat\Behat\Definition\Call;
 use Behat\Behat\Hook\Scope\AfterScenarioScope;
 use Behat\Behat\Hook\Scope\AfterStepScope;
-use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Behat\Hook\Scope\BeforeStepScope;
 use Behat\Behat\Hook\Scope\StepScope;
-use Behat\Gherkin\Node\ScenarioNode;
 use Behat\Mink\Driver\Selenium2Driver;
 use Behat\Mink\Element\NodeElement;
 use Behat\Mink\Session;
@@ -1225,26 +1223,4 @@ JS;
     {
         file_put_contents('php://stderr', 'Exception caught: ' . $exception->getMessage());
     }
-
-    /**
-     * Check if a step has a given tag
-     *
-     * @param StepScope $event
-     * @param string $tag
-     * @return bool
-     */
-    protected function stepHasTag(StepScope $event, $tag)
-    {
-        // Check feature
-        $feature = $event->getFeature();
-        if ($feature && $feature->hasTag($tag)) {
-            return true;
-        }
-        // Check scenario
-        $scenario = $this->getStepScenario($feature, $event->getStep());
-        if ($scenario && $scenario->hasTag($tag)) {
-            return true;
-        }
-        return false;
-    }
 }
diff --git a/src/Utility/StepHelper.php b/src/Utility/StepHelper.php
index e7d87c3..ef25a9e 100644
--- a/src/Utility/StepHelper.php
+++ b/src/Utility/StepHelper.php
@@ -2,6 +2,7 @@
 
 namespace SilverStripe\BehatExtension\Utility;
 
+use Behat\Behat\Hook\Scope\StepScope;
 use Behat\Gherkin\Node\FeatureNode;
 use Behat\Gherkin\Node\NodeInterface;
 use Behat\Gherkin\Node\ScenarioInterface;
@@ -60,4 +61,26 @@ trait StepHelper
         } while (--$timeout >= 0);
         throw $firstEx;
     }
+
+    /**
+     * Check if a step has a given tag
+     *
+     * @param StepScope $event
+     * @param string $tag
+     * @return bool
+     */
+    protected function stepHasTag(StepScope $event, $tag)
+    {
+        // Check feature
+        $feature = $event->getFeature();
+        if ($feature && $feature->hasTag($tag)) {
+            return true;
+        }
+        // Check scenario
+        $scenario = $this->getStepScenario($feature, $event->getStep());
+        if ($scenario && $scenario->hasTag($tag)) {
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index d4bfae0..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$frameworkPath = __DIR__ . '/../framework';
-$frameworkDir = basename($frameworkPath);
-if (!defined('BASE_PATH')) {
-    define('BASE_PATH', dirname($frameworkPath));
-}
-require_once 'Core/Core.php';
diff --git a/tests/php/SilverStripeContextTest.php b/tests/php/SilverStripeContextTest.php
index 1900707..9f3c96c 100644
--- a/tests/php/SilverStripeContextTest.php
+++ b/tests/php/SilverStripeContextTest.php
@@ -9,12 +9,20 @@ use Behat\Mink\Mink;
 use Behat\Mink\Driver\DriverInterface;
 use Behat\Mink\Element\Element;
 use SilverStripe\BehatExtension\Tests\SilverStripeContextTest\FeatureContext;
+use SilverStripe\Dev\SapphireTest;
 
 class SilverStripeContextTest extends \PHPUnit_Framework_TestCase
 {
 
     protected $backupGlobals = false;
 
+    public static function setUpBeforeClass()
+    {
+        // Bootstrap test environment
+        parent::setUpBeforeClass();
+        SapphireTest::start();
+    }
+
     /**
      * @expectedException \LogicException
      * @expectedExceptionMessage Cannot find 'region_map' in the behat.yml