diff --git a/test/phpunit/Migration/EntityDetectorTest.php b/test/phpunit/Migration/EntityDetectorTest.php
index 5453bf9..96277b1 100644
--- a/test/phpunit/Migration/EntityDetectorTest.php
+++ b/test/phpunit/Migration/EntityDetectorTest.php
@@ -2,9 +2,9 @@
 namespace Gt\Orm\Test\Migration;
 
 use Gt\Orm\Migration\EntityDetector;
-use Gt\Orm\Test\TestProjectRoot\SimpleEntitiesAndNonEntities\NestedNamespace\OrderEntity;
-use Gt\Orm\Test\TestProjectRoot\SimpleEntitiesAndNonEntities\NotAnEntity;
-use Gt\Orm\Test\TestProjectRoot\SimpleEntitiesAndNonEntities\PersonEntity;
+use Gt\Orm\Test\TestProject\EntityDetectorTest\SimpleEntitiesAndNonEntities\NestedNamespace\OrderEntity;
+use Gt\Orm\Test\TestProject\EntityDetectorTest\SimpleEntitiesAndNonEntities\NotAnEntity;
+use Gt\Orm\Test\TestProject\EntityDetectorTest\SimpleEntitiesAndNonEntities\PersonEntity;
 use PHPUnit\Framework\TestCase;
 
 class EntityDetectorTest extends TestCase {
@@ -16,7 +16,7 @@ public function testGetEntityClassList_noFiles():void {
 	}
 
 	public function testGetEntityClassList():void {
-		$dir = "test/phpunit/TestProject/01-EntityDetectorTest";
+		$dir = "test/phpunit/TestProject/EntityDetectorTest";
 		$sut = new EntityDetector();
 		$detected = $sut->getEntityClassList($dir);
 		self::assertCount(2, $detected);
diff --git a/test/phpunit/Migration/SchemaGeneratorTest.php b/test/phpunit/Migration/SchemaGeneratorTest.php
index c48efe1..8645314 100644
--- a/test/phpunit/Migration/SchemaGeneratorTest.php
+++ b/test/phpunit/Migration/SchemaGeneratorTest.php
@@ -3,7 +3,7 @@
 
 use DateTime;
 use Gt\Orm\Migration\SchemaGenerator;
-use Gt\Orm\Test\TestProjectRoot\SimpleEntitiesAndNonEntities\PersonEntity;
+use Gt\Orm\Test\TestProject\EntityDetectorTest\SimpleEntitiesAndNonEntities\PersonEntity;
 use PHPUnit\Framework\TestCase;
 
 class SchemaGeneratorTest extends TestCase {
diff --git a/test/phpunit/TestProject/01-EntityDetectorTest/SimpleEntitiesAndNonEntities/NotAnEntity.php b/test/phpunit/TestProject/01-EntityDetectorTest/SimpleEntitiesAndNonEntities/NotAnEntity.php
deleted file mode 100644
index 7ce2507..0000000
--- a/test/phpunit/TestProject/01-EntityDetectorTest/SimpleEntitiesAndNonEntities/NotAnEntity.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-namespace Gt\Orm\Test\TestProjectRoot\SimpleEntitiesAndNonEntities;
-
-readonly class NotAnEntity {
-
-}
diff --git a/test/phpunit/TestProject/01-EntityDetectorTest/SimpleEntitiesAndNonEntities/NestedNamespace/OrderEntity.php b/test/phpunit/TestProject/EntityDetectorTest/SimpleEntitiesAndNonEntities/NestedNamespace/OrderEntity.php
similarity index 54%
rename from test/phpunit/TestProject/01-EntityDetectorTest/SimpleEntitiesAndNonEntities/NestedNamespace/OrderEntity.php
rename to test/phpunit/TestProject/EntityDetectorTest/SimpleEntitiesAndNonEntities/NestedNamespace/OrderEntity.php
index 86bacd7..84f6341 100644
--- a/test/phpunit/TestProject/01-EntityDetectorTest/SimpleEntitiesAndNonEntities/NestedNamespace/OrderEntity.php
+++ b/test/phpunit/TestProject/EntityDetectorTest/SimpleEntitiesAndNonEntities/NestedNamespace/OrderEntity.php
@@ -1,9 +1,9 @@
 <?php
-namespace Gt\Orm\Test\TestProjectRoot\SimpleEntitiesAndNonEntities\NestedNamespace;
+namespace Gt\Orm\Test\TestProject\EntityDetectorTest\SimpleEntitiesAndNonEntities\NestedNamespace;
 
 use DateTime;
 use Gt\Orm\Entity;
-use Gt\Orm\Test\TestProjectRoot\SimpleEntitiesAndNonEntities\PersonEntity;
+use Gt\Orm\Test\TestProject\EntityDetectorTest\SimpleEntitiesAndNonEntities\PersonEntity;
 
 readonly class OrderEntity extends Entity {
 	public function __construct(
diff --git a/test/phpunit/TestProject/EntityDetectorTest/SimpleEntitiesAndNonEntities/NotAnEntity.php b/test/phpunit/TestProject/EntityDetectorTest/SimpleEntitiesAndNonEntities/NotAnEntity.php
new file mode 100644
index 0000000..df3b603
--- /dev/null
+++ b/test/phpunit/TestProject/EntityDetectorTest/SimpleEntitiesAndNonEntities/NotAnEntity.php
@@ -0,0 +1,6 @@
+<?php
+namespace Gt\Orm\Test\TestProject\EntityDetectorTest\SimpleEntitiesAndNonEntities;
+
+readonly class NotAnEntity {
+
+}
diff --git a/test/phpunit/TestProject/01-EntityDetectorTest/SimpleEntitiesAndNonEntities/PersonEntity.php b/test/phpunit/TestProject/EntityDetectorTest/SimpleEntitiesAndNonEntities/PersonEntity.php
similarity index 72%
rename from test/phpunit/TestProject/01-EntityDetectorTest/SimpleEntitiesAndNonEntities/PersonEntity.php
rename to test/phpunit/TestProject/EntityDetectorTest/SimpleEntitiesAndNonEntities/PersonEntity.php
index ed1eec7..60e79d8 100644
--- a/test/phpunit/TestProject/01-EntityDetectorTest/SimpleEntitiesAndNonEntities/PersonEntity.php
+++ b/test/phpunit/TestProject/EntityDetectorTest/SimpleEntitiesAndNonEntities/PersonEntity.php
@@ -1,5 +1,5 @@
 <?php
-namespace Gt\Orm\Test\TestProjectRoot\SimpleEntitiesAndNonEntities;
+namespace Gt\Orm\Test\TestProject\EntityDetectorTest\SimpleEntitiesAndNonEntities;
 
 use DateTime;
 use Gt\Orm\Entity;