diff --git a/tests/system/Commands/CommandClassTest.php b/tests/system/Commands/BaseCommandTest.php
similarity index 100%
rename from tests/system/Commands/CommandClassTest.php
rename to tests/system/Commands/BaseCommandTest.php
diff --git a/tests/system/Database/BaseQueryTest.php b/tests/system/Database/BaseQueryTest.php
index 4e09d49ccc24..5554c5f103e7 100644
--- a/tests/system/Database/BaseQueryTest.php
+++ b/tests/system/Database/BaseQueryTest.php
@@ -2,7 +2,7 @@
 
 use CodeIgniter\Test\Mock\MockConnection;
 
-class QueryTest extends \CodeIgniter\Test\CIUnitTestCase
+class BaseQueryTest extends \CodeIgniter\Test\CIUnitTestCase
 {
 	protected $db;
 
diff --git a/tests/system/Database/ConfigTest.php b/tests/system/Database/ConfigTest.php
index de38a5a4c0e0..82d9c3c9c513 100644
--- a/tests/system/Database/ConfigTest.php
+++ b/tests/system/Database/ConfigTest.php
@@ -5,7 +5,7 @@
 use CodeIgniter\Database\Config;
 use CodeIgniter\Test\ReflectionHelper;
 
-class DatabaseConfig extends \CodeIgniter\Test\CIUnitTestCase
+class ConfigTest extends \CodeIgniter\Test\CIUnitTestCase
 {
 	use ReflectionHelper;
 
diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php
index a82cb0edfb39..be70e7a079fd 100644
--- a/tests/system/Database/Migrations/MigrationRunnerTest.php
+++ b/tests/system/Database/Migrations/MigrationRunnerTest.php
@@ -1,8 +1,14 @@
-<?php namespace CodeIgniter\Database;
+<?php
 
+namespace CodeIgniter\Database\Migrations;
+
+use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Database\Config;
+use CodeIgniter\Database\MigrationRunner;
 use CodeIgniter\Events\Events;
 use CodeIgniter\Exceptions\ConfigException;
 use CodeIgniter\Test\CIDatabaseTestCase;
+use Config\Database;
 use Config\Migrations;
 use Config\Services;
 use org\bovigo\vfs\vfsStream;
@@ -32,7 +38,7 @@ public function setUp(): void
 
 	public function testLoadsDefaultDatabaseWhenNoneSpecified()
 	{
-		$dbConfig = new \Config\Database();
+		$dbConfig = new Database();
 		$runner   = new MigrationRunner($this->config);
 
 		$db = $this->getPrivateProperty($runner, 'db');
@@ -246,7 +252,7 @@ public function testMigrationThrowsDisabledException()
 
 	public function testVersionReturnsUpDownSuccess()
 	{
-		$forge = \Config\Database::forge();
+		$forge = Database::forge();
 		$forge->dropTable('foo', true);
 
 		$config = $this->config;
diff --git a/tests/system/Database/Migrations/MigrationTest.php b/tests/system/Database/Migrations/MigrationTest.php
index c8960811247f..358f594067cf 100644
--- a/tests/system/Database/Migrations/MigrationTest.php
+++ b/tests/system/Database/Migrations/MigrationTest.php
@@ -1,5 +1,8 @@
-<?php namespace CodeIgniter\Database;
+<?php
 
+namespace CodeIgniter\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
 use CodeIgniter\Test\CIDatabaseTestCase;
 
 class MigrationTest extends CIDatabaseTestCase
diff --git a/tests/system/Log/ChromeLoggerHandlerTest.php b/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
similarity index 100%
rename from tests/system/Log/ChromeLoggerHandlerTest.php
rename to tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
diff --git a/tests/system/Log/FileHandlerTest.php b/tests/system/Log/Handlers/FileHandlerTest.php
similarity index 100%
rename from tests/system/Log/FileHandlerTest.php
rename to tests/system/Log/Handlers/FileHandlerTest.php