diff --git a/.travis.yml b/.travis.yml
index 54c2637..5bdda12 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,5 @@
 sudo: true
 
-addons:
-  apt:
-    packages:
-      - oracle-java8-set-default
 before_install:
   - curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.2.0.deb && sudo dpkg -i --force-confnew elasticsearch-5.2.0.deb && sudo service elasticsearch restart
   - mysql -u root -e 'GRANT ALL ON `typo3_ci_ft%`.* TO travis@127.0.0.1;'
@@ -11,9 +7,8 @@ before_install:
 language: php
 
 php:
-  - 7.0
-  - 7.1
   - 7.2
+  - 7.3
 
 env:
   global:
@@ -26,8 +21,8 @@ env:
     - typo3DatabaseUsername="travis"
     - typo3DatabasePassword=""
   matrix:
-    - TYPO3_VERSION="~7.6"
-    - TYPO3_VERSION="~8.7"
+    - TYPO3_VERSION="^8.7"
+    - TYPO3_VERSION="^9.5"
 
 matrix:
   fast_finish: true
diff --git a/Makefile b/Makefile
index 21f6c31..29f0861 100644
--- a/Makefile
+++ b/Makefile
@@ -4,24 +4,15 @@ 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.7
+TYPO3_VERSION ?= ^9.5
 typo3DatabaseName ?= "searchcore_test"
 typo3DatabaseUsername ?= "dev"
 typo3DatabasePassword ?= "dev"
 typo3DatabaseHost ?= "127.0.0.1"
 
-sourceOrDist=--prefer-dist
-ifeq ($(TYPO3_VERSION),~7.6)
-	sourceOrDist=--prefer-source
-endif
-
 .PHONY: install
 install: clean
-	if [ $(TYPO3_VERSION) = ~7.6 ]; then \
-		patch composer.json Tests/InstallPatches/composer.json.patch; \
-	fi
-
-	COMPOSER_PROCESS_TIMEOUT=1000 composer require -vv --dev $(sourceOrDist) typo3/cms="$(TYPO3_VERSION)"
+	COMPOSER_PROCESS_TIMEOUT=1000 composer require -vv --dev typo3/cms-core="$(TYPO3_VERSION)"
 	git checkout composer.json
 
 cgl:
diff --git a/Tests/InstallPatches/composer.json.patch b/Tests/InstallPatches/composer.json.patch
deleted file mode 100644
index 6f11cdc..0000000
--- a/Tests/InstallPatches/composer.json.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/composer.json b/composer.json
-index 83e5f47..e9fa296 100644
---- a/composer.json
-+++ b/composer.json
-@@ -21,8 +21,7 @@
-         "ruflin/elastica": "~3.2"
-     },
-     "require-dev": {
--        "phpunit/phpunit": "~6.4.4",
--        "typo3/testing-framework": "~1.1.5",
-+        "phpunit/phpunit": "~5.7.0",
-         "squizlabs/php_codesniffer": "~3.1.1"
-     },
-     "config": {
diff --git a/composer.json b/composer.json
index aeb5552..0cdc272 100644
--- a/composer.json
+++ b/composer.json
@@ -16,14 +16,17 @@
         }
     },
     "require": {
-        "php": ">=7.0.0",
-        "typo3/cms-core": ">= 8.7.0 < 10.0.0",
-        "ruflin/elastica": "~3.2"
+        "php": ">=7.2.0 <8",
+        "typo3/cms-core": "^8.7 || ^9.5",
+        "ruflin/elastica": "^3.2"
+    },
+    "suggests": {
+        "typo3/cms-form": "To update indexed records via Formframework."
     },
     "require-dev": {
-        "phpunit/phpunit": "~6.4.4",
-        "typo3/testing-framework": "~1.1.5",
-        "squizlabs/php_codesniffer": "~3.1.1"
+        "squizlabs/php_codesniffer": "^3.4",
+        "typo3/testing-framework": "^2.0 || ^4.12",
+        "typo3/cms-form": "^8.7 || ^9.5"
     },
     "config": {
         "optimize-autoloader": true,