diff --git a/Configuration/FunctionalTests.xml b/Build/Tests/FunctionalTests.xml
similarity index 94%
rename from Configuration/FunctionalTests.xml
rename to Build/Tests/FunctionalTests.xml
index 41d9fb0b..f2da77fe 100644
--- a/Configuration/FunctionalTests.xml
+++ b/Build/Tests/FunctionalTests.xml
@@ -4,7 +4,7 @@
     xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
     backupGlobals="true"
     beStrictAboutTestsThatDoNotTestAnything="false"
-    bootstrap="../.Build/vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php"
+    bootstrap="../../.Build/vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php"
     cacheResult="false"
     colors="true"
     convertDeprecationsToExceptions="true"
diff --git a/Configuration/UnitTests.xml b/Build/Tests/UnitTests.xml
similarity index 92%
rename from Configuration/UnitTests.xml
rename to Build/Tests/UnitTests.xml
index 4eef49e9..0e1fa6ca 100644
--- a/Configuration/UnitTests.xml
+++ b/Build/Tests/UnitTests.xml
@@ -4,7 +4,7 @@
     xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
     backupGlobals="true"
     beStrictAboutTestsThatDoNotTestAnything="false"
-    bootstrap="../.Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php"
+    bootstrap="../../.Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php"
     cacheResult="false"
     colors="true"
     convertDeprecationsToExceptions="true"
diff --git a/composer.json b/composer.json
index f4cb2339..bf0f125a 100644
--- a/composer.json
+++ b/composer.json
@@ -124,7 +124,7 @@
 		"ci:coverage:functional": [
 			"@ci:tests:create-directories",
 			"@coverage:create-directories",
-			".Build/bin/phpunit -c ./Configuration/FunctionalTests.xml --whitelist Classes --coverage-php=.Build/coverage/functional.cov Tests/Functional"
+			".Build/bin/phpunit -c ./Build/Tests/FunctionalTests.xml --whitelist Classes --coverage-php=.Build/coverage/functional.cov Tests/Functional"
 		],
 		"ci:coverage:merge": [
 			"@coverage:create-directories",
@@ -132,7 +132,7 @@
 		],
 		"ci:coverage:unit": [
 			"@coverage:create-directories",
-			".Build/bin/phpunit -c ./Configuration/UnitTests.xml --whitelist Classes --coverage-php=.Build/coverage/unit.cov Tests/Unit"
+			".Build/bin/phpunit -c ./Build/Tests/UnitTests.xml --whitelist Classes --coverage-php=.Build/coverage/unit.cov Tests/Unit"
 		],
 		"ci:json:lint": "find . ! -path '*/.cache/*' ! -path '*/.Build/*' ! -path '*/node_modules/*' -name '*.json' | xargs -r php .Build/bin/jsonlint -q",
 		"ci:php": [
@@ -159,9 +159,9 @@
 		"ci:tests:create-directories": "mkdir -p .Build/public/typo3temp/var/tests",
 		"ci:tests:functional": [
 			"@ci:tests:create-directories",
-			"find 'Tests/Functional' -wholename '*Test.php' | parallel --gnu 'echo; echo \"Running functional test suite {}\"; .Build/bin/phpunit -c ./Configuration/FunctionalTests.xml {}';"
+			"find 'Tests/Functional' -wholename '*Test.php' | parallel --gnu 'echo; echo \"Running functional test suite {}\"; .Build/bin/phpunit -c ./Build/Tests/FunctionalTests.xml {}';"
 		],
-		"ci:tests:unit": ".Build/bin/phpunit -c ./Configuration/UnitTests.xml Tests/Unit",
+		"ci:tests:unit": ".Build/bin/phpunit -c ./Build/Tests/UnitTests.xml Tests/Unit",
 		"ci:ts:lint": "typoscript-lint -c Configuration/TsLint.yml --ansi -n --fail-on-warnings -vvv Configuration/TypoScript",
 		"ci:xliff:lint": "php Build/bin/xliff-lint lint:xliff Resources/Private/Language",
 		"ci:yaml:lint": "find . ! -path '*.Build/*' ! -path '*node_modules/*' \\( -name '*.yaml' -o -name '*.yml' \\) | xargs -r php ./.Build/bin/yaml-lint",
@@ -190,8 +190,8 @@
 			"rm .gitignore",
 			"rm .php-cs-fixer.php",
 			"rm .prettierrc.js",
-			"rm Configuration/FunctionalTests.xml",
-			"rm Configuration/UnitTests.xml",
+			"rm Build/Tests/FunctionalTests.xml",
+			"rm Build/Tests/UnitTests.xml",
 			"rm .npmrc",
 			"rm .nvmrc",
 			"rm package.json",