diff --git a/tests/src/Core/Storage/StorageTest.php b/tests/StorageTestCase.php
similarity index 95%
rename from tests/src/Core/Storage/StorageTest.php
rename to tests/StorageTestCase.php
index 9816db914c..8a2ffda446 100644
--- a/tests/src/Core/Storage/StorageTest.php
+++ b/tests/StorageTestCase.php
@@ -5,14 +5,14 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-namespace Friendica\Test\src\Core\Storage;
+namespace Friendica\Test;
 
 use Friendica\Core\Storage\Capability\ICanReadFromStorage;
 use Friendica\Core\Storage\Capability\ICanWriteToStorage;
 use Friendica\Core\Storage\Exception\ReferenceStorageException;
 use Friendica\Test\MockedTestCase;
 
-abstract class StorageTest extends MockedTestCase
+abstract class StorageTestCase extends MockedTestCase
 {
 	/** @return ICanWriteToStorage */
 	abstract protected function getInstance();
diff --git a/tests/src/Core/Storage/DatabaseStorageTest.php b/tests/src/Core/Storage/DatabaseStorageTest.php
index 17660ceed2..ab3c514b1d 100644
--- a/tests/src/Core/Storage/DatabaseStorageTest.php
+++ b/tests/src/Core/Storage/DatabaseStorageTest.php
@@ -8,9 +8,10 @@
 namespace Friendica\Test\src\Core\Storage;
 
 use Friendica\Core\Storage\Type\Database;
+use Friendica\Test\StorageTestCase;
 use Friendica\Test\Util\CreateDatabaseTrait;
 
-class DatabaseStorageTest extends StorageTest
+class DatabaseStorageTest extends StorageTestCase
 {
 	use CreateDatabaseTrait;
 
diff --git a/tests/src/Core/Storage/FilesystemStorageTest.php b/tests/src/Core/Storage/FilesystemStorageTest.php
index 64bcb68a4a..2d2cfa8d3a 100644
--- a/tests/src/Core/Storage/FilesystemStorageTest.php
+++ b/tests/src/Core/Storage/FilesystemStorageTest.php
@@ -10,10 +10,11 @@ namespace Friendica\Test\src\Core\Storage;
 use Friendica\Core\Storage\Exception\StorageException;
 use Friendica\Core\Storage\Type\Filesystem;
 use Friendica\Core\Storage\Type\FilesystemConfig;
+use Friendica\Test\StorageTestCase;
 use Friendica\Test\Util\VFSTrait;
 use org\bovigo\vfs\vfsStream;
 
-class FilesystemStorageTest extends StorageTest
+class FilesystemStorageTest extends StorageTestCase
 {
 	use VFSTrait;