diff --git a/tests/src/Core/Cache/CacheTest.php b/tests/CacheTestCase.php
similarity index 98%
rename from tests/src/Core/Cache/CacheTest.php
rename to tests/CacheTestCase.php
index 47c5a7ccca..c3db14b274 100644
--- a/tests/src/Core/Cache/CacheTest.php
+++ b/tests/CacheTestCase.php
@@ -5,13 +5,13 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-namespace Friendica\Test\src\Core\Cache;
+namespace Friendica\Test;
 
 use Friendica\Core\Cache\Capability\ICanCache;
 use Friendica\Test\MockedTestCase;
 use Friendica\Util\PidFile;
 
-abstract class CacheTest extends MockedTestCase
+abstract class CacheTestCase extends MockedTestCase
 {
 	/**
 	 * @var int Start time of the mock (used for time operations)
diff --git a/tests/src/Core/Cache/DatabaseCacheTest.php b/tests/src/Core/Cache/DatabaseCacheTest.php
index 5b4c61bc88..7b9f404ae1 100644
--- a/tests/src/Core/Cache/DatabaseCacheTest.php
+++ b/tests/src/Core/Cache/DatabaseCacheTest.php
@@ -7,13 +7,13 @@
 
 namespace Friendica\Test\src\Core\Cache;
 
-use Friendica\App\BaseURL;
-use Friendica\Core\Cache;
+use Friendica\Core\Cache\Type\DatabaseCache;
+use Friendica\Test\CacheTestCase;
 use Friendica\Test\DatabaseTestTrait;
 use Friendica\Test\Util\CreateDatabaseTrait;
 use Friendica\Test\Util\VFSTrait;
 
-class DatabaseCacheTest extends CacheTest
+class DatabaseCacheTest extends CacheTestCase
 {
 	use DatabaseTestTrait;
 	use CreateDatabaseTrait;
@@ -30,7 +30,7 @@ class DatabaseCacheTest extends CacheTest
 
 	protected function getInstance()
 	{
-		$this->cache = new Cache\Type\DatabaseCache('database', $this->getDbInstance());
+		$this->cache = new DatabaseCache('database', $this->getDbInstance());
 		return $this->cache;
 	}
 
diff --git a/tests/src/Core/Cache/MemoryCacheTest.php b/tests/src/Core/Cache/MemoryCacheTest.php
index 2e24e29c06..e6c82d3f14 100644
--- a/tests/src/Core/Cache/MemoryCacheTest.php
+++ b/tests/src/Core/Cache/MemoryCacheTest.php
@@ -9,8 +9,9 @@ namespace Friendica\Test\src\Core\Cache;
 
 use Exception;
 use Friendica\Core\Cache\Capability\ICanCacheInMemory;
+use Friendica\Test\CacheTestCase;
 
-abstract class MemoryCacheTest extends CacheTest
+abstract class MemoryCacheTest extends CacheTestCase
 {
 	/**
 	 * @var \Friendica\Core\Cache\Capability\ICanCacheInMemory