diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 55da5f89..f912807c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,15 +15,10 @@ jobs:
         php: [ '8.2', '8.3', '8.4' ]
     steps:
 
-      - name: Extract branch name
-        shell: bash
-        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
-        id: extract_branch
-
-      - name: Checkout ${{ steps.extract_branch.outputs.branch }}
+      - name: Checkout ${{ github.event_name == 'workflow_dispatch' && github.head_ref || '' }}
         uses: actions/checkout@v4
         with:
-          ref: ${{ steps.extract_branch.outputs.branch }}
+          ref: ${{ github.event_name == 'workflow_dispatch' && github.head_ref || '' }}
 
       - name: Composer install
         run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -s composerUpdate
diff --git a/Build/phpstan/phpstan-baseline.neon b/Build/phpstan/phpstan-baseline.neon
index 364905f7..461c373c 100644
--- a/Build/phpstan/phpstan-baseline.neon
+++ b/Build/phpstan/phpstan-baseline.neon
@@ -1,2 +1,37 @@
 parameters:
 	ignoreErrors:
+		-
+			message: '#^Offset 0 on non\-empty\-list\<string\> on left side of \?\? always exists and is not nullable\.$#'
+			identifier: nullCoalesce.offset
+			count: 1
+			path: ../../Classes/Composer/ComposerPackageManager.php
+
+		-
+			message: '#^Trait TYPO3\\TestingFramework\\Core\\AccessibleProxyTrait is used zero times and is not analysed\.$#'
+			identifier: trait.unused
+			count: 1
+			path: ../../Classes/Core/AccessibleProxyTrait.php
+
+		-
+			message: '#^Call to function is_array\(\) with non\-empty\-array will always evaluate to true\.$#'
+			identifier: function.alreadyNarrowedType
+			count: 1
+			path: ../../Classes/Core/Functional/Framework/Constraint/RequestSection/DoesNotHaveRecordConstraint.php
+
+		-
+			message: '#^Call to function is_array\(\) with non\-empty\-array will always evaluate to true\.$#'
+			identifier: function.alreadyNarrowedType
+			count: 1
+			path: ../../Classes/Core/Functional/Framework/Constraint/RequestSection/HasRecordConstraint.php
+
+		-
+			message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
+			identifier: staticMethod.alreadyNarrowedType
+			count: 1
+			path: ../../Classes/Core/Functional/FunctionalTestCase.php
+
+		-
+			message: '#^Strict comparison using \!\=\= between int\|string\|true and false will always evaluate to true\.$#'
+			identifier: notIdentical.alwaysTrue
+			count: 1
+			path: ../../Classes/Core/Functional/FunctionalTestCase.php
diff --git a/Build/phpunit/UnitTests.xml b/Build/phpunit/UnitTests.xml
index e08a2226..e2cfe4a4 100644
--- a/Build/phpunit/UnitTests.xml
+++ b/Build/phpunit/UnitTests.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.2/phpunit.xsd"
-         beStrictAboutTestsThatDoNotTestAnything="false"
          cacheDirectory=".phpunit.cache"
          cacheResult="false"
          colors="true"
diff --git a/Classes/Core/Acceptance/Extension/BackendEnvironment.php b/Classes/Core/Acceptance/Extension/BackendEnvironment.php
index a073b645..1aecb468 100644
--- a/Classes/Core/Acceptance/Extension/BackendEnvironment.php
+++ b/Classes/Core/Acceptance/Extension/BackendEnvironment.php
@@ -261,8 +261,8 @@ public function bootstrapTypo3Environment(SuiteEvent $suiteEvent)
             $testbase->testDatabaseNameIsNotTooLong($originalDatabaseName, $localConfiguration);
             if ($dbDriver === 'mysqli' || $dbDriver === 'pdo_mysql') {
                 $localConfiguration['DB']['Connections']['Default']['charset'] = 'utf8mb4';
-                $localConfiguration['DB']['Connections']['Default']['tableoptions']['charset'] = 'utf8mb4';
-                $localConfiguration['DB']['Connections']['Default']['tableoptions']['collate'] = 'utf8mb4_unicode_ci';
+                $localConfiguration['DB']['Connections']['Default']['defaultTableOptions']['charset'] = 'utf8mb4';
+                $localConfiguration['DB']['Connections']['Default']['defaultTableOptions']['collation'] = 'utf8mb4_unicode_ci';
             }
         } else {
             // sqlite dbs of all tests are stored in a dir parallel to instance roots. Allows defining this path as tmpfs.
diff --git a/Classes/Core/Functional/FunctionalTestCase.php b/Classes/Core/Functional/FunctionalTestCase.php
index 7f0667e9..c755344f 100644
--- a/Classes/Core/Functional/FunctionalTestCase.php
+++ b/Classes/Core/Functional/FunctionalTestCase.php
@@ -615,6 +615,10 @@ protected function assertCSVDataSet(string $fileName): void
             $hasHashField = ($dataSet->getHashIndex($tableName) !== null);
             $records = $this->getAllRecords($tableName, $hasUidField, $hasHashField);
             $assertions = $dataSet->getElements($tableName);
+            if (count($assertions) === 0) {
+                // Increase assertion counter to avoid "test did not perform any assertions" if testing for an empty table
+                self::assertThat(true, self::isTrue());
+            }
             foreach ($assertions as $assertion) {
                 $result = $this->assertInRecords($assertion, $records);
                 if ($result === false) {
diff --git a/Classes/Core/Testbase.php b/Classes/Core/Testbase.php
index cafd2a5f..4b848ccf 100644
--- a/Classes/Core/Testbase.php
+++ b/Classes/Core/Testbase.php
@@ -498,7 +498,7 @@ public function testDatabaseNameIsNotTooLong(string $originalDatabaseName, array
     }
 
     /**
-     * Create LocalConfiguration.php file of the test instance.
+     * Create settings.php file of the test instance.
      * For functional and acceptance tests.
      *
      * @param non-empty-string $instancePath Absolute path to test instance
@@ -513,8 +513,9 @@ public function setUpLocalConfiguration(string $instancePath, array $configurati
         $finalConfigurationArray = require $coreExtensionPath . '/Configuration/FactoryConfiguration.php';
         $finalConfigurationArray = array_replace_recursive($finalConfigurationArray, $configuration);
         $finalConfigurationArray = array_replace_recursive($finalConfigurationArray, $overruleConfiguration);
+        $this->createDirectory($instancePath . '/typo3conf/system');
         $result = @file_put_contents(
-            $instancePath . '/typo3conf/LocalConfiguration.php',
+            $instancePath . '/typo3conf/system/settings.php',
             '<?php' . chr(10) .
             'return ' .
             ArrayUtility::arrayExport(
diff --git a/README.md b/README.md
index 9180eb4f..68536d41 100644
--- a/README.md
+++ b/README.md
@@ -21,8 +21,8 @@ Usage examples within core and for extensions can be found in
 
 ## Tags and branches
 
-* Branch main is used by core v13 and tagged as 9.x.x. Extensions can use this to
-  run tests with core v13. Supports PHP ^8.2.
+* Branch main is used by core v13 and v14, tagged as 9.x.x. Extensions can use this to
+  run tests with core v13 and v14. Supports PHP ^8.2.
 * Branch 8 is used by core v12 and tagged as 8.x.x. Extensions can use this to
   run tests with core v12 and prepare for v13 compatibility. Supports PHP ^8.1.
 * Branch 7 is used by core v11 and tagged as 7.x.x. Extensions can use this to
diff --git a/Resources/Core/Build/FunctionalTests.xml b/Resources/Core/Build/FunctionalTests.xml
index 763776af..abc26606 100644
--- a/Resources/Core/Build/FunctionalTests.xml
+++ b/Resources/Core/Build/FunctionalTests.xml
@@ -16,7 +16,6 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.2/phpunit.xsd"
          backupGlobals="true"
-         beStrictAboutTestsThatDoNotTestAnything="false"
          bootstrap="FunctionalTestsBootstrap.php"
          cacheDirectory=".phpunit.cache"
          cacheResult="false"
diff --git a/Resources/Core/Build/FunctionalTestsBootstrap.php b/Resources/Core/Build/FunctionalTestsBootstrap.php
index a95bc520..9882f8fe 100644
--- a/Resources/Core/Build/FunctionalTestsBootstrap.php
+++ b/Resources/Core/Build/FunctionalTestsBootstrap.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of the TYPO3 CMS project.
  *
diff --git a/Resources/Core/Build/UnitTests.xml b/Resources/Core/Build/UnitTests.xml
index f03beb01..00c71bef 100644
--- a/Resources/Core/Build/UnitTests.xml
+++ b/Resources/Core/Build/UnitTests.xml
@@ -16,7 +16,6 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.2/phpunit.xsd"
          backupGlobals="true"
-         beStrictAboutTestsThatDoNotTestAnything="false"
          bootstrap="UnitTestsBootstrap.php"
          cacheDirectory=".phpunit.cache"
          cacheResult="false"
diff --git a/Resources/Core/Build/UnitTestsBootstrap.php b/Resources/Core/Build/UnitTestsBootstrap.php
index 45bb0a1b..acddbffb 100644
--- a/Resources/Core/Build/UnitTestsBootstrap.php
+++ b/Resources/Core/Build/UnitTestsBootstrap.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of the TYPO3 CMS project.
  *
diff --git a/Resources/Core/Functional/Extensions/json_response/Classes/Middleware/BackendUserHandler.php b/Resources/Core/Functional/Extensions/json_response/Classes/Middleware/BackendUserHandler.php
index 1b002c1d..dde7afa1 100644
--- a/Resources/Core/Functional/Extensions/json_response/Classes/Middleware/BackendUserHandler.php
+++ b/Resources/Core/Functional/Extensions/json_response/Classes/Middleware/BackendUserHandler.php
@@ -19,13 +19,13 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use TYPO3\CMS\Backend\FrontendBackendUserAuthentication;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Context\UserAspect;
 use TYPO3\CMS\Core\Context\WorkspaceAspect;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Frontend\Authentication\FrontendBackendUserAuthentication;
 use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequestContext;
 
 /**
diff --git a/Resources/Core/Functional/Extensions/json_response/Configuration/RequestMiddlewares.php b/Resources/Core/Functional/Extensions/json_response/Configuration/RequestMiddlewares.php
index d2c71eea..cbcda5bd 100644
--- a/Resources/Core/Functional/Extensions/json_response/Configuration/RequestMiddlewares.php
+++ b/Resources/Core/Functional/Extensions/json_response/Configuration/RequestMiddlewares.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * An array consisting of implementations of middlewares for a middleware stack to be registered
  *
diff --git a/composer.json b/composer.json
index ad7234ad..22a245a6 100644
--- a/composer.json
+++ b/composer.json
@@ -30,11 +30,11 @@
     "guzzlehttp/psr7": "^2.5.0",
     "phpunit/phpunit": "^11.2.5",
     "psr/container": "^2.0",
-    "typo3/cms-backend": "13.*.*@dev",
-    "typo3/cms-core": "13.*.*@dev",
-    "typo3/cms-extbase": "13.*.*@dev",
-    "typo3/cms-fluid": "13.*.*@dev",
-    "typo3/cms-frontend": "13.*.*@dev"
+    "typo3/cms-backend": "13.*.*@dev || 14.*.*@dev",
+    "typo3/cms-core": "13.*.*@dev || 14.*.*@dev",
+    "typo3/cms-extbase": "13.*.*@dev || 14.*.*@dev",
+    "typo3/cms-fluid": "13.*.*@dev || 14.*.*@dev",
+    "typo3/cms-frontend": "13.*.*@dev || 14.*.*@dev"
   },
   "config": {
     "vendor-dir": ".Build/vendor",
@@ -59,10 +59,10 @@
     }
   },
   "require-dev": {
-    "friendsofphp/php-cs-fixer": "^3.59.3",
-    "phpstan/phpstan": "^1.11.5",
-    "phpstan/phpstan-phpunit": "^1.4.0",
-    "typo3/cms-workspaces": "13.*.*@dev"
+    "friendsofphp/php-cs-fixer": "^3.65.0",
+    "phpstan/phpstan": "^2.0.2",
+    "phpstan/phpstan-phpunit": "^2.0.1",
+    "typo3/cms-workspaces": "13.*.*@dev || 14.*.*@dev"
   },
   "replace": {
     "sbuerk/typo3-cmscomposerinstallers-testingframework-bridge": "*"