diff --git a/composer.json b/composer.json
index d70b430c90ae396cb210c6f30733c49b3d7ee367..6180a02cb93ffd63f922d3a02ec9b8a6d8fa8b80 100644
--- a/composer.json
+++ b/composer.json
@@ -92,7 +92,7 @@
 		"phpspec/prophecy": "^1.7.5",
 		"phpstan/phpstan": "^0.12.44",
 		"typo3/cms-styleguide": "~11.0.0",
-		"typo3/testing-framework": "^6.4.2"
+		"typo3/testing-framework": "^6.4.3"
 	},
 	"suggest": {
 		"ext-gd": "GDlib/Freetype is required for building images with text (GIFBUILDER) and can also be used to scale images",
diff --git a/composer.lock b/composer.lock
index f10302789d8d284b4aacbb4971512ee1dd6c69c8..4bc69da472d126c64bdadb6ef9168c44abb24555 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "19298b87a63c62f4b6e1be515e7c0df3",
+    "content-hash": "52f3f27b45bf17950fe59c832b4a66a3",
     "packages": [
         {
             "name": "cogpowered/finediff",
@@ -8305,16 +8305,16 @@
         },
         {
             "name": "typo3/testing-framework",
-            "version": "6.4.2",
+            "version": "6.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3/testing-framework.git",
-                "reference": "972da70e5000f294390d7ba5d0928861bf6727ed"
+                "reference": "22461bc2b45c408b1ce4f2ae9521117e795f0c65"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/972da70e5000f294390d7ba5d0928861bf6727ed",
-                "reference": "972da70e5000f294390d7ba5d0928861bf6727ed",
+                "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/22461bc2b45c408b1ce4f2ae9521117e795f0c65",
+                "reference": "22461bc2b45c408b1ce4f2ae9521117e795f0c65",
                 "shasum": ""
             },
             "require": {
@@ -8362,7 +8362,12 @@
                 "tests",
                 "typo3"
             ],
-            "time": "2020-09-03T23:49:02+00:00"
+            "support": {
+                "general": "https://typo3.org/support/",
+                "issues": "https://github.com/TYPO3/testing-framework/issues",
+                "source": "https://github.com/TYPO3/testing-framework/tree/6.4.3"
+            },
+            "time": "2020-09-30T06:12:51+00:00"
         }
     ],
     "aliases": [],
@@ -8383,5 +8388,5 @@
     "platform-overrides": {
         "php": "7.2.5"
     },
-    "plugin-api-version": "1.1.0"
+    "plugin-api-version": "2.0.0"
 }
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index 7953fa5f848068ce26984a42781efaa5fcba85d8..1a750dc34648a94741fb530c032b4e5d6b249bef 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -72,7 +72,7 @@
 		"phpspec/prophecy": "^1.7.5",
 		"phpstan/phpstan": "^0.12.44",
 		"typo3/cms-styleguide": "~11.0.0",
-		"typo3/testing-framework": "^6.4.2"
+		"typo3/testing-framework": "^6.4.3"
 	},
 	"suggest": {
 		"ext-fileinfo": "Used for proper file type detection in the file abstraction layer",
diff --git a/typo3/sysext/frontend/Configuration/RequestMiddlewares.php b/typo3/sysext/frontend/Configuration/RequestMiddlewares.php
index edf22ab48255ee0381fcf0b344c36ab3202c476a..cb66612ae43d5c77257a6507dda8c7b3addb6a00 100644
--- a/typo3/sysext/frontend/Configuration/RequestMiddlewares.php
+++ b/typo3/sysext/frontend/Configuration/RequestMiddlewares.php
@@ -67,7 +67,7 @@ return [
         'typo3/cms-frontend/base-redirect-resolver' => [
             'target' => \TYPO3\CMS\Frontend\Middleware\SiteBaseRedirectResolver::class,
             'after' => [
-                'typo3/cms-frontend/site-resolver',
+                'typo3/cms-frontend/site',
             ],
             'before' => [
                 'typo3/cms-frontend/static-route-resolver'