diff --git a/Makefile b/Makefile
index e8177b9..87bcdfc 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ current_dir := $(dir $(mkfile_path))
 TYPO3_WEB_DIR := $(current_dir).Build/web
 TYPO3_PATH_ROOT := $(current_dir).Build/web
 # Allow different versions on travis
-TYPO3_VERSION ?= ~8.2
+TYPO3_VERSION ?= ~8.7
 typo3DatabaseName ?= "searchcore_test2"
 typo3DatabaseUsername ?= "dev"
 typo3DatabasePassword ?= "dev"
@@ -12,7 +12,7 @@ typo3DatabaseHost ?= "127.0.0.1"
 
 .PHONY: install
 install: clean
-	COMPOSER_PROCESS_TIMEOUT=1000 composer require -vv --dev --prefer-source --ignore-platform-reqs typo3/cms="$(TYPO3_VERSION)"
+	COMPOSER_PROCESS_TIMEOUT=1000 composer require -vv --dev --prefer-dist --ignore-platform-reqs typo3/cms="$(TYPO3_VERSION)"
 	git checkout composer.json
 
 functionalTests:
diff --git a/Tests/Unit/UnitTests.xml b/Tests/Unit/UnitTests.xml
index 6456405..6486594 100644
--- a/Tests/Unit/UnitTests.xml
+++ b/Tests/Unit/UnitTests.xml
@@ -1,7 +1,7 @@
 <phpunit
     backupGlobals="false"
     backupStaticAttributes="false"
-    bootstrap="../../.Build/vendor/typo3/cms/typo3/sysext/core/Build/UnitTestsBootstrap.php"
+    bootstrap="../../.Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php"
 
     colors="true"
     convertErrorsToExceptions="false"
diff --git a/composer.json b/composer.json
index e0da7a1..f56b60a 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,8 @@
         "ruflin/elastica": "~3.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "~5.7.0"
+        "typo3/testing-framework": "~1.1.0",
+        "phpunit/phpunit": "~6.2.0"
     },
     "config": {
         "optimize-autoloader": true,