diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 9d00209..5fb72ba 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,18 +11,9 @@ jobs:
       fail-fast: false
       matrix:
         php: [ '8.2', '8.3', '8.4', '8.5' ]
-        typo3: [ '12', '13' ]
+        typo3: [ '12', '13', '14' ]
         experimental: [false]
         composerInstall: [ 'composerInstallLowest', 'composerInstallHighest' ]
-        include:
-          - typo3: '14'
-            php: '8.5'
-            composerInstall: 'composerInstallLowest'
-            experimental: true
-          - typo3: '14'
-            php: '8.5'
-            composerInstall: 'composerInstallHighest'
-            experimental: true
 
     steps:
       - name: Checkout
diff --git a/Build/phpstan/phpstan.cms14.neon b/Build/phpstan/phpstan.cms14.neon
new file mode 100644
index 0000000..b545cef
--- /dev/null
+++ b/Build/phpstan/phpstan.cms14.neon
@@ -0,0 +1,5 @@
+parameters:
+  level: 8
+  paths:
+    - ../../Classes
+    - ../../Configuration
\ No newline at end of file
diff --git a/Classes/Builder/RequestContextBuilder.php b/Classes/Builder/RequestContextBuilder.php
index 8eb7582..d7a5b6c 100644
--- a/Classes/Builder/RequestContextBuilder.php
+++ b/Classes/Builder/RequestContextBuilder.php
@@ -32,10 +32,9 @@ public function build(RequestParameters $parameters): RequestContext
         }
         $url = $this->generateUri($site, $parameters);
 
-        /** @var ModifyUrlEvent $event */
-        $event = $this->eventDispatcher->dispatch(
-            new ModifyUrlEvent($url, $site, $parameters)
-        );
+        $event = new ModifyUrlEvent($url, $site, $parameters);
+        $this->eventDispatcher->dispatch($event);
+
         return new RequestContext(
             $event->getUrl(),
             $site,
diff --git a/Classes/Request/FrontendRequest.php b/Classes/Request/FrontendRequest.php
index e108b1b..321a1a6 100644
--- a/Classes/Request/FrontendRequest.php
+++ b/Classes/Request/FrontendRequest.php
@@ -23,9 +23,8 @@ public function getHtmlResponse(RequestContext $context): string
     {
         $request = $this->requestFactory->createRequest('GET', $context->getUrl());
 
-        $event = $this->eventDispatcher->dispatch(
-            new ModifyRequestEvent($request, $context)
-        );
+        $event = new ModifyRequestEvent($request, $context);
+        $this->eventDispatcher->dispatch($event);
 
         try {
             $response = $this->client->sendRequest($event->getRequest());
diff --git a/composer.json b/composer.json
index a151442..cdd9c59 100644
--- a/composer.json
+++ b/composer.json
@@ -34,11 +34,11 @@
         "friendsofphp/php-cs-fixer": "^3.60.0",
         "php-parallel-lint/php-parallel-lint": "^1.4",
         "phpstan/extension-installer": "^1.0",
-        "phpstan/phpstan": "^1.12",
-        "phpunit/phpunit": "^10.1",
-        "saschaegerer/phpstan-typo3": "^1.10",
+        "phpstan/phpstan": "^1.12 || ^2.1",
+        "phpunit/phpunit": "^10.1 || ^11.2.5",
+        "saschaegerer/phpstan-typo3": "^1.10 || ^2.1 || ^3.0.1",
         "typo3/coding-standards": "^0.7.1 || ^0.8.0",
-        "typo3/testing-framework": "^7.1.0 || ^8.2.0"
+        "typo3/testing-framework": "^7.1.0 || ^8.2.0 || ^9.5.0"
     },
     "replace": {
         "typo3-ter/frontend-request": "self.version"