diff --git a/typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php b/typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php
index 98cadaf3444a9cf47bc6743705535a02467b95b2..9e68d1a379cc8ec55877fccd346ff9df142f8bf2 100644
--- a/typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php
@@ -14,6 +14,9 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\SignalSlot;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Tests\Unit\SignalSlot\Fixtures\OnlyClassNameSpecifiedFixture;
+use TYPO3\CMS\Extbase\Tests\Unit\SignalSlot\Fixtures\SlotMethodDoesNotExistFixture;
+
 /**
  * Test case
  */
@@ -86,9 +89,8 @@ class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	 * @test
 	 */
 	public function dispatchRetrievesSlotInstanceFromTheObjectManagerIfOnlyAClassNameWasSpecified() {
-		$slotClassName = $this->getUniqueId('Mock_');
-		eval('class ' . $slotClassName . ' { function slot($foo, $baz) { $this->arguments = array($foo, $baz); } }');
-		$mockSlot = new $slotClassName();
+		$slotClassName = OnlyClassNameSpecifiedFixture::class;
+		$mockSlot = new OnlyClassNameSpecifiedFixture();
 		$mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
 		$mockObjectManager->expects($this->once())->method('isRegistered')->with($slotClassName)->will($this->returnValue(TRUE));
 		$mockObjectManager->expects($this->once())->method('get')->with($slotClassName)->will($this->returnValue($mockSlot));
@@ -237,9 +239,8 @@ class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	 * @expectedException \TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotException
 	 */
 	public function dispatchThrowsAnExceptionIfTheSpecifiedSlotMethodDoesNotExist() {
-		$slotClassName = $this->getUniqueId('Mock_');
-		eval('class ' . $slotClassName . ' { function slot($foo, $baz) { $this->arguments = array($foo, $baz); } }');
-		$mockSlot = new $slotClassName();
+		$slotClassName = SlotMethodDoesNotExistFixture::class;
+		$mockSlot = new SlotMethodDoesNotExistFixture();
 		$mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
 		$mockObjectManager->expects($this->once())->method('isRegistered')->with($slotClassName)->will($this->returnValue(TRUE));
 		$mockObjectManager->expects($this->once())->method('get')->with($slotClassName)->will($this->returnValue($mockSlot));
diff --git a/typo3/sysext/extbase/Tests/Unit/SignalSlot/Fixtures/OnlyClassNameSpecifiedFixture.php b/typo3/sysext/extbase/Tests/Unit/SignalSlot/Fixtures/OnlyClassNameSpecifiedFixture.php
new file mode 100644
index 0000000000000000000000000000000000000000..9aa8e7721969740eaaa38dbc9a3319f38a4a9c48
--- /dev/null
+++ b/typo3/sysext/extbase/Tests/Unit/SignalSlot/Fixtures/OnlyClassNameSpecifiedFixture.php
@@ -0,0 +1,35 @@
+<?php
+namespace TYPO3\CMS\Extbase\Tests\Unit\SignalSlot\Fixtures;
+
+/*
+ * 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 OnlyClassNameSpecifiedFixture {
+
+	/**
+	 * @var array
+	 */
+	public $arguments;
+
+	/**
+	 * @param string $foo
+	 * @param string $baz
+	 */
+	public function slot($foo, $baz) {
+		$this->arguments = array($foo, $baz);
+	}
+
+}
diff --git a/typo3/sysext/extbase/Tests/Unit/SignalSlot/Fixtures/SlotMethodDoesNotExistFixture.php b/typo3/sysext/extbase/Tests/Unit/SignalSlot/Fixtures/SlotMethodDoesNotExistFixture.php
new file mode 100644
index 0000000000000000000000000000000000000000..7f11ec708b5f66eaf70153283e06cb8d794c1717
--- /dev/null
+++ b/typo3/sysext/extbase/Tests/Unit/SignalSlot/Fixtures/SlotMethodDoesNotExistFixture.php
@@ -0,0 +1,35 @@
+<?php
+namespace TYPO3\CMS\Extbase\Tests\Unit\SignalSlot\Fixtures;
+
+/*
+ * 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 SlotMethodDoesNotExistFixture {
+
+	/**
+	 * @var array
+	 */
+	public $arguments;
+
+	/**
+	 * @param string $foo
+	 * @param string $baz
+	 */
+	public function slot($foo, $baz) {
+		$this->arguments = array($foo, $baz);
+	}
+
+}