diff --git a/tests/lib/TestCase.php b/tests/lib/TestCase.php
index 82bf5d2e6cf..1782bd359ba 100644
--- a/tests/lib/TestCase.php
+++ b/tests/lib/TestCase.php
@@ -339,8 +339,11 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase {
 		self::tearDownAfterClassCleanStrayLocks();
 
 		/** @var Factory $appDataFactory */
-		$appDataFactory = Server::get(Factory::class);
-		$appDataFactory->clearFilesystemCache();
+		//$appDataFactory = Server::get(Factory::class);
+		//$appDataFactory->clearFilesystemCache();
+
+		unset(\OC::$server[\OC\Files\AppData\Factory::class]);
+		unset(\OC::$server[\OC\App\AppStore\Fetcher\AppFetcher::class]);
 
 		/** @var SetupManager $setupManager */
 		$setupManager = Server::get(SetupManager::class);