diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php
index 88477ff29be3..9889d66a7c0c 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence\Generic\Mapper;
 
 /*
@@ -62,32 +63,8 @@ public function mapSingleRowReturnsObjectFromPersistenceSessionIfAvailable()
      */
     public function thawPropertiesSetsPropertyValues()
     {
-        $className = $this->getUniqueId('Class');
-        $classNameWithNS = __NAMESPACE__ . '\\' . $className;
-        eval('namespace ' . __NAMESPACE__ . '; class ' . $className . ' extends \\' . \TYPO3\CMS\Extbase\DomainObject\AbstractEntity::class . ' {
-		 
-		 /**
-		  * @var string
-		  */
-		 public $firstProperty; 
-		 
-		 /**
-		  * @var int
-		  */
-		 public $secondProperty; 
-		 
-		 /**
-		  * @var float
-		  */
-		 public $thirdProperty; 
-		 
-		 /**
-		  * @var bool
-		  */
-		 public $fourthProperty;
-		 }'
-        );
-        $object = new $classNameWithNS();
+        $className = Fixture\DummyEntity::class;
+        $object = new Fixture\DummyEntity();
         $row = [
             'uid' => '1234',
             'firstProperty' => 'firstValue',
@@ -105,10 +82,10 @@ public function thawPropertiesSetsPropertyValues()
         $dataMap = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap::class, ['dummy'], [$className, $className]);
         $dataMap->_set('columnMaps', $columnMaps);
         $dataMaps = [
-            $classNameWithNS => $dataMap
+            $className => $dataMap
         ];
         /** @var AccessibleObjectInterface|\TYPO3\CMS\Extbase\Reflection\ClassSchema $classSchema */
-        $classSchema = new ClassSchema($classNameWithNS);
+        $classSchema = new ClassSchema($className);
         $mockReflectionService = $this->getMockBuilder(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class)
             ->setMethods(['getClassSchema'])
             ->getMock();
@@ -201,23 +178,11 @@ public function mapObjectToClassPropertyReturnsExistingObjectWithoutCallingFetch
             ->disableOriginalConstructor()
             ->getMock();
 
-        $className = $this->getUniqueId('Class1');
-        $classNameWithNS = __NAMESPACE__ . '\\' . $className;
-
-        $className2 = $this->getUniqueId('Class2');
-        $className2WithNS = __NAMESPACE__ . '\\' . $className2;
-        eval('namespace ' . __NAMESPACE__ . '; class ' . $className2 . ' extends \\' . \TYPO3\CMS\Extbase\DomainObject\AbstractEntity::class . ' { }');
-        eval('namespace ' . __NAMESPACE__ . '; class ' . $className . ' extends \\' . \TYPO3\CMS\Extbase\DomainObject\AbstractEntity::class . ' { 
-            /**
-             * @var ' . $className2WithNS . '
-             */
-            public $relationProperty; 
-        }');
-        $object = new $classNameWithNS();
-        $child = new $className2WithNS();
+        $object = new Fixture\DummyParentEntity();
+        $child = new Fixture\DummyChildEntity();
 
         /** @var \TYPO3\CMS\Extbase\Reflection\ClassSchema|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject $classSchema1 */
-        $classSchema1 = new ClassSchema($classNameWithNS);
+        $classSchema1 = new ClassSchema(Fixture\DummyParentEntity::class);
         $identifier = 1;
 
         $session = new \TYPO3\CMS\Extbase\Persistence\Generic\Session();
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/Fixture/DummyChildEntity.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/Fixture/DummyChildEntity.php
new file mode 100644
index 000000000000..c1149138db25
--- /dev/null
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/Fixture/DummyChildEntity.php
@@ -0,0 +1,23 @@
+<?php
+declare(strict_types=1);
+namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence\Generic\Mapper\Fixture;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+/**
+ * Fixture
+ */
+class DummyChildEntity extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
+{
+}
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/Fixture/DummyEntity.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/Fixture/DummyEntity.php
new file mode 100644
index 000000000000..ccd02ffbfcf5
--- /dev/null
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/Fixture/DummyEntity.php
@@ -0,0 +1,42 @@
+<?php
+declare(strict_types=1);
+namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence\Generic\Mapper\Fixture;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+/**
+ * Fixture
+ */
+class DummyEntity extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
+{
+    /**
+     * @var string
+     */
+    public $firstProperty;
+
+    /**
+     * @var int
+     */
+    public $secondProperty;
+
+    /**
+     * @var float
+     */
+    public $thirdProperty;
+
+    /**
+     * @var bool
+     */
+    public $fourthProperty;
+}
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/Fixture/DummyParentEntity.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/Fixture/DummyParentEntity.php
new file mode 100644
index 000000000000..0c4775ac738f
--- /dev/null
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/Fixture/DummyParentEntity.php
@@ -0,0 +1,27 @@
+<?php
+declare(strict_types=1);
+namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence\Generic\Mapper\Fixture;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+/**
+ * Fixture
+ */
+class DummyParentEntity extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
+{
+    /**
+     * @var \TYPO3\CMS\Extbase\Tests\Unit\Persistence\Generic\Mapper\Fixture\DummyChildEntity
+     */
+    public $relationProperty;
+}