diff --git a/tests/DatabaseTest.php b/tests/DatabaseTestCase.php
similarity index 89%
rename from tests/DatabaseTest.php
rename to tests/DatabaseTestCase.php
index af6e45226a..b061a7f21a 100644
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTestCase.php
@@ -10,7 +10,7 @@ namespace Friendica\Test;
 /**
  * Abstract class used by tests that need a database.
  */
-abstract class DatabaseTest extends MockedTestCase
+abstract class DatabaseTestCase extends MockedTestCase
 {
 	use DatabaseTestTrait;
 
diff --git a/tests/Util/CreateDatabaseTrait.php b/tests/Util/CreateDatabaseTrait.php
index c188ee8f94..52a7625734 100644
--- a/tests/Util/CreateDatabaseTrait.php
+++ b/tests/Util/CreateDatabaseTrait.php
@@ -13,7 +13,7 @@ use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Database\Database;
 use Friendica\Database\Definition\DbaDefinition;
 use Friendica\Database\Definition\ViewDefinition;
-use Friendica\Test\DatabaseTestTrait;
+use Friendica\Test\DatabaseTestCaseTrait;
 use Friendica\Test\Util\Database\StaticDatabase;
 use Friendica\Util\Profiler;
 use Psr\Log\NullLogger;
diff --git a/tests/src/Content/PageInfoTest.php b/tests/src/Content/PageInfoTest.php
index a88c1fe4a6..324381a4dd 100644
--- a/tests/src/Content/PageInfoTest.php
+++ b/tests/src/Content/PageInfoTest.php
@@ -7,9 +7,9 @@
 
 namespace Friendica\Test\src\Content;
 
-use Friendica\Test\DatabaseTest;
+use Friendica\Test\DatabaseTestCase;
 
-class PageInfoTest extends DatabaseTest
+class PageInfoTest extends DatabaseTestCase
 {
 	public function dataGetRelevantUrlFromBody()
 	{
diff --git a/tests/src/Core/Cache/DatabaseCacheTest.php b/tests/src/Core/Cache/DatabaseCacheTest.php
index 5b4c61bc88..66e44d4754 100644
--- a/tests/src/Core/Cache/DatabaseCacheTest.php
+++ b/tests/src/Core/Cache/DatabaseCacheTest.php
@@ -9,7 +9,7 @@ namespace Friendica\Test\src\Core\Cache;
 
 use Friendica\App\BaseURL;
 use Friendica\Core\Cache;
-use Friendica\Test\DatabaseTestTrait;
+use Friendica\Test\DatabaseTestCaseTrait;
 use Friendica\Test\Util\CreateDatabaseTrait;
 use Friendica\Test\Util\VFSTrait;
 
diff --git a/tests/src/Core/Config/ConfigTest.php b/tests/src/Core/Config/ConfigTest.php
index ed5e329aea..83dbaa0af0 100644
--- a/tests/src/Core/Config/ConfigTest.php
+++ b/tests/src/Core/Config/ConfigTest.php
@@ -13,12 +13,12 @@ use Friendica\Core\Config\Model\DatabaseConfig;
 use Friendica\Core\Config\Model\ReadOnlyFileConfig;
 use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Core\Config\ValueObject\Cache;
-use Friendica\Test\DatabaseTest;
+use Friendica\Test\DatabaseTestCase;
 use Friendica\Test\Util\CreateDatabaseTrait;
 use Friendica\Test\Util\VFSTrait;
 use org\bovigo\vfs\vfsStream;
 
-class ConfigTest extends DatabaseTest
+class ConfigTest extends DatabaseTestCase
 {
 	use ArraySubsetAsserts;
 	use VFSTrait;
diff --git a/tests/src/Core/Config/ConfigTransactionTest.php b/tests/src/Core/Config/ConfigTransactionTest.php
index 65efe3e14e..5c704b7600 100644
--- a/tests/src/Core/Config/ConfigTransactionTest.php
+++ b/tests/src/Core/Config/ConfigTransactionTest.php
@@ -14,7 +14,7 @@ use Friendica\Core\Config\Model\ConfigTransaction;
 use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Database\Database;
-use Friendica\Test\DatabaseTest;
+use Friendica\Test\DatabaseTestCase;
 use Friendica\Test\FixtureTestCase;
 use Friendica\Test\MockedTest;
 use Friendica\Test\Util\Database\StaticDatabase;
diff --git a/tests/src/Core/Storage/Repository/StorageManagerTest.php b/tests/src/Core/Storage/Repository/StorageManagerTest.php
index 0123f512c7..ac74274c03 100644
--- a/tests/src/Core/Storage/Repository/StorageManagerTest.php
+++ b/tests/src/Core/Storage/Repository/StorageManagerTest.php
@@ -26,7 +26,7 @@ use Friendica\Database\Definition\ViewDefinition;
 use Friendica\DI;
 use Friendica\Core\Config\Factory\Config;
 use Friendica\Core\Storage\Type;
-use Friendica\Test\DatabaseTest;
+use Friendica\Test\DatabaseTestCase;
 use Friendica\Test\Util\CreateDatabaseTrait;
 use Friendica\Test\Util\Database\StaticDatabase;
 use Friendica\Test\Util\VFSTrait;
@@ -36,7 +36,7 @@ use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use Friendica\Test\Util\SampleStorageBackend;
 
-class StorageManagerTest extends DatabaseTest
+class StorageManagerTest extends DatabaseTestCase
 {
 	use CreateDatabaseTrait;
 
diff --git a/tests/src/Database/DBATest.php b/tests/src/Database/DBATest.php
index 242af45470..49d3a6a5e6 100644
--- a/tests/src/Database/DBATest.php
+++ b/tests/src/Database/DBATest.php
@@ -11,10 +11,10 @@ use Dice\Dice;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Test\DatabaseTest;
+use Friendica\Test\DatabaseTestCase;
 use Friendica\Test\Util\Database\StaticDatabase;
 
-class DBATest extends DatabaseTest
+class DBATest extends DatabaseTestCase
 {
 	protected function setUp(): void
 	{
diff --git a/tests/src/Database/DBStructureTest.php b/tests/src/Database/DBStructureTest.php
index 377c753a47..9ce3475ee7 100644
--- a/tests/src/Database/DBStructureTest.php
+++ b/tests/src/Database/DBStructureTest.php
@@ -11,10 +11,10 @@ use Dice\Dice;
 use Friendica\Database\Database;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
-use Friendica\Test\DatabaseTest;
+use Friendica\Test\DatabaseTestCase;
 use Friendica\Test\Util\Database\StaticDatabase;
 
-class DBStructureTest extends DatabaseTest
+class DBStructureTest extends DatabaseTestCase
 {
 	protected function setUp(): void
 	{