diff --git a/Build/phpstan/phpstan-baseline.neon b/Build/phpstan/phpstan-baseline.neon
index a0ea097d33f4881463346d70b86d05168ca47101..81605ce7f33a4e7ff230ea601d10b5799dba6753 100644
--- a/Build/phpstan/phpstan-baseline.neon
+++ b/Build/phpstan/phpstan-baseline.neon
@@ -1430,11 +1430,6 @@ parameters:
 			count: 1
 			path: ../../typo3/sysext/core/Tests/Unit/Cache/Frontend/PhpFrontendTest.php
 
-		-
-			message: "#^Result of method TYPO3\\\\CMS\\\\Core\\\\Configuration\\\\FlexForm\\\\FlexFormTools\\:\\:traverseFlexFormXMLData_recurse\\(\\) \\(void\\) is used\\.$#"
-			count: 2
-			path: ../../typo3/sysext/core/Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php
-
 		-
 			message: "#^Parameter \\#2 \\$coreCache of class TYPO3\\\\CMS\\\\Core\\\\ExpressionLanguage\\\\ProviderConfigurationLoader constructor expects TYPO3\\\\CMS\\\\Core\\\\Cache\\\\Frontend\\\\PhpFrontend, TYPO3\\\\CMS\\\\Core\\\\Cache\\\\Frontend\\\\FrontendInterface given\\.$#"
 			count: 1
diff --git a/typo3/sysext/core/Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php b/typo3/sysext/core/Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php
index 2d0e05b73807e57cf4820d02fdd92ad7f51b04ef..4da7631d9f676bfec570525a6b28c5baa3414594 100644
--- a/typo3/sysext/core/Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php
+++ b/typo3/sysext/core/Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php
@@ -17,44 +17,13 @@ declare(strict_types=1);
 
 namespace TYPO3\CMS\Core\Tests\Unit\Configuration\FlexForm;
 
-use Prophecy\Argument;
-use Prophecy\PhpUnit\ProphecyTrait;
-use Psr\EventDispatcher\EventDispatcherInterface;
-use TYPO3\CMS\Core\Cache\CacheManager;
-use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
 use TYPO3\CMS\Core\Configuration\FlexForm\FlexFormTools;
+use TYPO3\CMS\Core\EventDispatcher\NoopEventDispatcher;
 use TYPO3\CMS\Core\Tests\Unit\Fixtures\EventDispatcher\MockEventDispatcher;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 class FlexFormToolsTest extends UnitTestCase
 {
-    use ProphecyTrait;
-
-    protected bool $resetSingletonInstances = true;
-
-    /**
-     * @var EventDispatcherInterface
-     */
-    protected object $nullDispatcher;
-
-    /**
-     * Set up
-     */
-    public function setUp(): void
-    {
-        parent::setUp();
-        // Underlying static GeneralUtility::xml2array() uses caches that have to be mocked here
-        $cacheManagerProphecy = $this->prophesize(CacheManager::class);
-        $cacheProphecy = $this->prophesize(FrontendInterface::class);
-        $cacheManagerProphecy->getCache('runtime')->willReturn($cacheProphecy->reveal());
-        $cacheProphecy->get(Argument::cetera())->willReturn(false);
-        $cacheProphecy->set(Argument::cetera())->willReturn(false);
-        GeneralUtility::setSingletonInstance(CacheManager::class, $cacheManagerProphecy->reveal());
-
-        $this->nullDispatcher = new MockEventDispatcher();
-    }
-
     /**
      * @test
      */
@@ -71,7 +40,7 @@ class FlexFormToolsTest extends UnitTestCase
         ];
         $editData = [];
         $subject = $this->getMockBuilder(FlexFormTools::class)
-            ->setConstructorArgs([$this->nullDispatcher])
+            ->setConstructorArgs([new MockEventDispatcher()])
             ->onlyMethods(['executeCallBackMethod'])
             ->getMock();
         $subject->expects(self::never())->method('executeCallBackMethod');
@@ -99,10 +68,8 @@ class FlexFormToolsTest extends UnitTestCase
             ],
         ];
         $editData2 = [];
-        $subject = $this->createMock(FlexFormTools::class);
-        self::assertEquals(
-            $subject->traverseFlexFormXMLData_recurse($dataStruct, $editData, $pA),
-            $subject->traverseFlexFormXMLData_recurse($dataStruct, $editData2, $pA)
-        );
+        $flexFormTools = new FlexFormTools(new NoopEventDispatcher());
+        $flexFormTools->traverseFlexFormXMLData_recurse($dataStruct, $editData, $pA);
+        $flexFormTools->traverseFlexFormXMLData_recurse($dataStruct, $editData2, $pA);
     }
 }