diff --git a/.travis.yml b/.travis.yml
index d160b27..fc0913f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,5 +30,5 @@ before_script:
  - php ~/travis-support/travis_setup_php54_webserver.php --if-env BEHAT_TEST
 
 script: 
- - "if [ \"$BEHAT_TEST\" = \"\" ]; then phpunit subsites/tests; fi"
+ - "if [ \"$BEHAT_TEST\" = \"\" ]; then vendor/bin/phpunit subsites/tests; fi"
  - "if [ \"$BEHAT_TEST\" = \"1\" ]; then vendor/bin/behat @subsites; fi"
diff --git a/code/extensions/FileSubsites.php b/code/extensions/FileSubsites.php
index 44eb3b0..2aee52c 100644
--- a/code/extensions/FileSubsites.php
+++ b/code/extensions/FileSubsites.php
@@ -57,7 +57,7 @@ class FileSubsites extends DataExtension {
 	/**
 	 * Update any requests to limit the results to the current site
 	 */
-	public function augmentSQL(SQLSelect $query) {
+	public function augmentSQL(SQLQuery &$query) {
 		if(Subsite::$disable_subsite_filter) return;
 
 		// If you're querying by ID, ignore the sub-site - this is a bit ugly... (but it was WAYYYYYYYYY worse)
diff --git a/code/extensions/GroupSubsites.php b/code/extensions/GroupSubsites.php
index dcd3e6e..11f0b9d 100644
--- a/code/extensions/GroupSubsites.php
+++ b/code/extensions/GroupSubsites.php
@@ -107,7 +107,7 @@ class GroupSubsites extends DataExtension implements PermissionProvider {
 	/**
 	 * Update any requests to limit the results to the current site
 	 */
-	public function augmentSQL(SQLSelect $query) {
+	public function augmentSQL(SQLQuery &$query) {
 		if(Subsite::$disable_subsite_filter) return;
 		if(Cookie::get('noSubsiteFilter') == 'true') return;
 
diff --git a/code/extensions/SiteConfigSubsites.php b/code/extensions/SiteConfigSubsites.php
index 21a441d..c0f66c2 100644
--- a/code/extensions/SiteConfigSubsites.php
+++ b/code/extensions/SiteConfigSubsites.php
@@ -12,7 +12,7 @@ class SiteConfigSubsites extends DataExtension {
 	/**
 	 * Update any requests to limit the results to the current site
 	 */
-	public function augmentSQL(SQLSelect $query) {
+	public function augmentSQL(SQLQuery &$query) {
 		if(Subsite::$disable_subsite_filter) return;
 
 		// If you're querying by ID, ignore the sub-site - this is a bit ugly...
diff --git a/code/extensions/SiteTreeSubsites.php b/code/extensions/SiteTreeSubsites.php
index f8bae92..ebb2a2b 100644
--- a/code/extensions/SiteTreeSubsites.php
+++ b/code/extensions/SiteTreeSubsites.php
@@ -25,7 +25,7 @@ class SiteTreeSubsites extends DataExtension {
 	/**
 	 * Update any requests to limit the results to the current site
 	 */
-	public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null) {
+	public function augmentSQL(SQLQuery &$query, DataQuery &$dataQuery = null) {
 		if(Subsite::$disable_subsite_filter) return;
 		if($dataQuery->getQueryParam('Subsite.filter') === false) return;
 		
diff --git a/composer.json b/composer.json
index 9a83c9a..82e472b 100644
--- a/composer.json
+++ b/composer.json
@@ -14,6 +14,9 @@
 		"silverstripe/framework": "~3.2",
 		"silverstripe/cms": "~3.2"
 	},
+	"require-dev": {
+		"phpunit/PHPUnit": "~3.7@stable"
+	},
 	"extra": {
 		"branch-alias": {
 			"dev-master": "1.1.x-dev"
diff --git a/tests/behat/features/bootstrap/Context/FeatureContext.php b/tests/behat/features/bootstrap/Context/FeatureContext.php
index 4c3b82e..1ac5c27 100644
--- a/tests/behat/features/bootstrap/Context/FeatureContext.php
+++ b/tests/behat/features/bootstrap/Context/FeatureContext.php
@@ -2,6 +2,8 @@
 
 namespace Subsites\Test\Behaviour;
 
+if(!class_exists('SilverStripe\BehatExtension\Context\SilverStripeContext')) return;
+
 use SilverStripe\BehatExtension\Context\SilverStripeContext,
     SilverStripe\BehatExtension\Context\BasicContext,
     SilverStripe\BehatExtension\Context\LoginContext,