diff --git a/typo3/sysext/core/Tests/Acceptance/Application/Dashboard/DashboardModuleCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Dashboard/DashboardModuleCest.php
index 525b9e5b1013ae30dfa1b0bd595cd36456eccd99..b0128e5dc8f67038870cb63e84fa5c0ab73773c7 100644
--- a/typo3/sysext/core/Tests/Acceptance/Application/Dashboard/DashboardModuleCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Application/Dashboard/DashboardModuleCest.php
@@ -15,7 +15,7 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Info;
+namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Dashboard;
 
 use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester;
 use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\ModalDialog;
diff --git a/typo3/sysext/core/Tests/Acceptance/Application/Workspace/WorkspaceModuleCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Workspace/WorkspaceModuleCest.php
index 1e9f769721f269a327147768b3b208a5aba7efe6..736a9fd8d6f693262ecbe0ac1fc8ef590cb37736 100644
--- a/typo3/sysext/core/Tests/Acceptance/Application/Workspace/WorkspaceModuleCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Application/Workspace/WorkspaceModuleCest.php
@@ -15,7 +15,7 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Page;
+namespace TYPO3\CMS\Core\Tests\Acceptance\Application\Workspace;
 
 use TYPO3\CMS\Core\Tests\Acceptance\Support\ApplicationTester;
 use TYPO3\CMS\Core\Tests\Acceptance\Support\Helper\ModalDialog;
diff --git a/typo3/sysext/core/Tests/Functional/Cache/Core/ClassAliasLoaderTest.php b/typo3/sysext/core/Tests/Functional/Cache/Core/ClassAliasLoaderTest.php
index a389cac077900c8ce1ab236c30a479b9e6b5d554..7f7e7383dca5458f15fb0e4d7d3800a41e16776d 100644
--- a/typo3/sysext/core/Tests/Functional/Cache/Core/ClassAliasLoaderTest.php
+++ b/typo3/sysext/core/Tests/Functional/Cache/Core/ClassAliasLoaderTest.php
@@ -15,7 +15,7 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace TYPO3\CMS\Core\Tests\Functional\Core;
+namespace TYPO3\CMS\Core\Tests\Functional\Cache\Core;
 
 use Prophecy\PhpUnit\ProphecyTrait;
 use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
diff --git a/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/EmailSoftReferenceParserTest.php b/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/EmailSoftReferenceParserTest.php
index c0f4db1143f367a4df4c4e611f152450d3321ac2..75c750095d7b5999e58fa5a8bca5a08f82d1fff3 100644
--- a/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/EmailSoftReferenceParserTest.php
+++ b/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/EmailSoftReferenceParserTest.php
@@ -15,9 +15,7 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace Unit\DataHandling\SoftReference;
-
-use TYPO3\CMS\Core\Tests\Unit\DataHandling\SoftReference\AbstractSoftReferenceParserTest;
+namespace TYPO3\CMS\Core\Tests\Unit\DataHandling\SoftReference;
 
 class EmailSoftReferenceParserTest extends AbstractSoftReferenceParserTest
 {
diff --git a/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/ExtensionPathSoftReferenceParserTest.php b/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/ExtensionPathSoftReferenceParserTest.php
index 053e95faad9fd77476369a1752cbf4044ea77316..6118ad1a558e8789725dee2992ef2b6b1aefa7d5 100644
--- a/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/ExtensionPathSoftReferenceParserTest.php
+++ b/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/ExtensionPathSoftReferenceParserTest.php
@@ -15,9 +15,7 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace Unit\DataHandling\SoftReference;
-
-use TYPO3\CMS\Core\Tests\Unit\DataHandling\SoftReference\AbstractSoftReferenceParserTest;
+namespace TYPO3\CMS\Core\Tests\Unit\DataHandling\SoftReference;
 
 class ExtensionPathSoftReferenceParserTest extends AbstractSoftReferenceParserTest
 {
diff --git a/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/NotifySoftReferenceParserTest.php b/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/NotifySoftReferenceParserTest.php
index fd82cf075804dd930a0f2692dbecfa2beb4c5276..9b41530d03caf28c85d14a60855907b8d47f3150 100644
--- a/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/NotifySoftReferenceParserTest.php
+++ b/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/NotifySoftReferenceParserTest.php
@@ -15,9 +15,7 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace Unit\DataHandling\SoftReference;
-
-use TYPO3\CMS\Core\Tests\Unit\DataHandling\SoftReference\AbstractSoftReferenceParserTest;
+namespace TYPO3\CMS\Core\Tests\Unit\DataHandling\SoftReference;
 
 class NotifySoftReferenceParserTest extends AbstractSoftReferenceParserTest
 {
diff --git a/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/SubstituteSoftReferenceParserTest.php b/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/SubstituteSoftReferenceParserTest.php
index d46df8bb809f6dbbe0ffb2c6ce6673de398aaaa9..4a2456d58e1144d3b34776003dcf5f4810c5d6f2 100644
--- a/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/SubstituteSoftReferenceParserTest.php
+++ b/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/SubstituteSoftReferenceParserTest.php
@@ -15,9 +15,7 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace Unit\DataHandling\SoftReference;
-
-use TYPO3\CMS\Core\Tests\Unit\DataHandling\SoftReference\AbstractSoftReferenceParserTest;
+namespace TYPO3\CMS\Core\Tests\Unit\DataHandling\SoftReference;
 
 class SubstituteSoftReferenceParserTest extends AbstractSoftReferenceParserTest
 {
diff --git a/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/TypoLinkSoftReferenceParserTest.php b/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/TypoLinkSoftReferenceParserTest.php
index be7fecb5de6af46c645506334381a18508df1189..5922eb44169814e19388f52a2b5cac58f1687708 100644
--- a/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/TypoLinkSoftReferenceParserTest.php
+++ b/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/TypoLinkSoftReferenceParserTest.php
@@ -15,12 +15,11 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace Unit\DataHandling\SoftReference;
+namespace TYPO3\CMS\Core\Tests\Unit\DataHandling\SoftReference;
 
 use TYPO3\CMS\Core\Resource\File;
 use TYPO3\CMS\Core\Resource\Folder;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
-use TYPO3\CMS\Core\Tests\Unit\DataHandling\SoftReference\AbstractSoftReferenceParserTest;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class TypoLinkSoftReferenceParserTest extends AbstractSoftReferenceParserTest
diff --git a/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/TypoLinkTagSoftReferenceParserTest.php b/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/TypoLinkTagSoftReferenceParserTest.php
index 0174bcad5a6d0dedce3a19e1a864e2d3569c74c7..f16fa377ce95d284bec6532e4a1f40c8a8b2861e 100644
--- a/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/TypoLinkTagSoftReferenceParserTest.php
+++ b/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/TypoLinkTagSoftReferenceParserTest.php
@@ -15,12 +15,11 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace Unit\DataHandling\SoftReference;
+namespace TYPO3\CMS\Core\Tests\Unit\DataHandling\SoftReference;
 
 use TYPO3\CMS\Core\Resource\File;
 use TYPO3\CMS\Core\Resource\Folder;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
-use TYPO3\CMS\Core\Tests\Unit\DataHandling\SoftReference\AbstractSoftReferenceParserTest;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class TypoLinkTagSoftReferenceParserTest extends AbstractSoftReferenceParserTest
diff --git a/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/UrlSoftReferenceParserTest.php b/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/UrlSoftReferenceParserTest.php
index f44cc347166d000f09539e516653ee9b7c8320a5..56f3a168a2be7feb02b83c2a28329cf6f3727039 100644
--- a/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/UrlSoftReferenceParserTest.php
+++ b/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/UrlSoftReferenceParserTest.php
@@ -15,9 +15,7 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace Unit\DataHandling\SoftReference;
-
-use TYPO3\CMS\Core\Tests\Unit\DataHandling\SoftReference\AbstractSoftReferenceParserTest;
+namespace TYPO3\CMS\Core\Tests\Unit\DataHandling\SoftReference;
 
 class UrlSoftReferenceParserTest extends AbstractSoftReferenceParserTest
 {