diff --git a/typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php b/typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php
index 4c63bb2238acf9a8e0b20cd1cdc20c4f2bc14257..43166a4c27c56f20e17c4a1db273aa1a5fcc0e9b 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php
@@ -28,7 +28,6 @@ use TYPO3\CMS\Core\Resource\ResourceStorage;
 use TYPO3\CMS\Core\Tests\Unit\Resource\BaseTestCase;
 use TYPO3\CMS\Core\Tests\Unit\Resource\Driver\Fixtures\LocalDriverFilenameFilter;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\TestingFramework\Core\FileStreamWrapper;
 
 /**
  * Test case
@@ -384,24 +383,22 @@ class LocalDriverTest extends BaseTestCase
      */
     public function getSpecificFileInformationReturnsRequestedFileInformation($expectedValue, string $property): void
     {
-        $root = vfsStream::setup();
+        $root = vfsStream::setup('root');
+
         $subFolder = vfsStream::newDirectory('fileadmin');
         $root->addChild($subFolder);
+
         // Load fixture files and folders from disk
         $directory = vfsStream::copyFromFileSystem(__DIR__ . '/Fixtures/', $subFolder, 1024 * 1024);
         if (in_array($property, ['mtime', 'ctime', 'atime'])) {
             $expectedValue = $directory->getChild('Dummy.html')->filemtime();
         }
-        FileStreamWrapper::init(Environment::getPublicPath() . '/');
-        FileStreamWrapper::registerOverlayPath('fileadmin', 'vfs://root/fileadmin', false);
 
-        $subject = $this->createDriver(['basePath' => Environment::getPublicPath() . '/fileadmin']);
+        $subject = $this->createDriver(['basePath' => 'vfs://root/fileadmin']);
         self::assertSame(
             $expectedValue,
-            $subject->getSpecificFileInformation(Environment::getPublicPath() . '/fileadmin/Dummy.html', '/', $property)
+            $subject->getSpecificFileInformation('vfs://root/fileadmin/Dummy.html', '/', $property)
         );
-
-        FileStreamWrapper::destroy();
     }
 
     /**
@@ -676,22 +673,18 @@ class LocalDriverTest extends BaseTestCase
      */
     public function getFileReturnsCorrectIdentifier(): void
     {
-        $root = vfsStream::setup();
+        $root = vfsStream::setup('root');
         $subFolder = vfsStream::newDirectory('fileadmin');
         $root->addChild($subFolder);
         // Load fixture files and folders from disk
         vfsStream::copyFromFileSystem(__DIR__ . '/Fixtures/', $subFolder, 1024 * 1024);
-        FileStreamWrapper::init(Environment::getPublicPath() . '/');
-        FileStreamWrapper::registerOverlayPath('fileadmin/', 'vfs://root/fileadmin/', false);
 
-        $subject = $this->createDriver(['basePath' => Environment::getPublicPath() . '/fileadmin']);
+        $subject = $this->createDriver(['basePath' => 'vfs://root/fileadmin']);
 
         $subdirFileInfo = $subject->getFileInfoByIdentifier('Dummy.html');
         self::assertEquals('/Dummy.html', $subdirFileInfo['identifier']);
         $rootFileInfo = $subject->getFileInfoByIdentifier('LocalDriverFilenameFilter.php');
         self::assertEquals('/LocalDriverFilenameFilter.php', $rootFileInfo['identifier']);
-
-        FileStreamWrapper::destroy();
     }
 
     /**
diff --git a/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
index dd8074fa12c19fd63926a4909e2e02ea38114f53..2c2011c41bd51856b6f20ce793ac5f713a85361c 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
@@ -37,7 +37,6 @@ use TYPO3\CMS\Core\Tests\Unit\Utility\Fixtures\ReplacementClassFixture;
 use TYPO3\CMS\Core\Tests\Unit\Utility\Fixtures\TwoParametersConstructorFixture;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\TestingFramework\Core\FileStreamWrapper;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 /**
@@ -2897,13 +2896,9 @@ class GeneralUtilityTest extends UnitTestCase
      */
     public function mkdirDeepCreatesDirectoryWithDoubleSlashes($directoryToCreate)
     {
-        vfsStream::setup();
-        // Load fixture files and folders from disk
-        FileStreamWrapper::init(Environment::getPublicPath());
-        FileStreamWrapper::registerOverlayPath('fileadmin', 'vfs://root/fileadmin', true);
-        GeneralUtility::mkdir_deep(Environment::getPublicPath() . '/' . $directoryToCreate);
-        self::assertTrue(is_dir(Environment::getPublicPath() . '/' . $directoryToCreate));
-        FileStreamWrapper::destroy();
+        vfsStream::setup('root', null, ['public' => []]);
+        GeneralUtility::mkdir_deep('vfs://root/public/' . $directoryToCreate);
+        self::assertTrue(is_dir('vfs://root/public/' . $directoryToCreate));
     }
 
     /**