diff --git a/core/tests/Drupal/Tests/Core/Database/Driver/mysql/ConnectionTest.php b/core/modules/mysql/tests/src/Unit/ConnectionTest.php
similarity index 98%
rename from core/tests/Drupal/Tests/Core/Database/Driver/mysql/ConnectionTest.php
rename to core/modules/mysql/tests/src/Unit/ConnectionTest.php
index fcfd6b08860e2447e6a2c072e3f52d4e5886adb1..878d7672ada4b6cfb3d956c6f39a67bfffbbdc29 100644
--- a/core/tests/Drupal/Tests/Core/Database/Driver/mysql/ConnectionTest.php
+++ b/core/modules/mysql/tests/src/Unit/ConnectionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\Core\Database\Driver\mysql;
+namespace Drupal\Tests\mysql\Unit;
 
 use Drupal\mysql\Driver\Database\mysql\Connection;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/tests/Drupal/Tests/Core/Database/Driver/mysql/install/TasksTest.php b/core/modules/mysql/tests/src/Unit/InstallTasksTest.php
similarity index 96%
rename from core/tests/Drupal/Tests/Core/Database/Driver/mysql/install/TasksTest.php
rename to core/modules/mysql/tests/src/Unit/InstallTasksTest.php
index b8b6915aea2d00ff5ad72121473776ea85fd62a6..f0cb3c88bfd2e3fdb52c61786eba1e3808cf5d81 100644
--- a/core/tests/Drupal/Tests/Core/Database/Driver/mysql/install/TasksTest.php
+++ b/core/modules/mysql/tests/src/Unit/InstallTasksTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\Core\Database\Driver\mysql\install;
+namespace Drupal\Tests\mysql\Unit;
 
 use Drupal\mysql\Driver\Database\mysql\Connection;
 use Drupal\mysql\Driver\Database\mysql\Install\Tasks;
@@ -12,7 +12,7 @@
  * @coversDefaultClass \Drupal\mysql\Driver\Database\mysql\Install\Tasks
  * @group Database
  */
-class TasksTest extends UnitTestCase {
+class InstallTasksTest extends UnitTestCase {
 
   /**
    * A connection object prophecy.
diff --git a/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlSchemaTest.php b/core/modules/pgsql/tests/src/Unit/SchemaTest.php
similarity index 95%
rename from core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlSchemaTest.php
rename to core/modules/pgsql/tests/src/Unit/SchemaTest.php
index 0e50eb18408bc6045528db4905c8d49b093f3359..7673638143b2d194358dfaab8f01089fdbe82d77 100644
--- a/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlSchemaTest.php
+++ b/core/modules/pgsql/tests/src/Unit/SchemaTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\Core\Database\Driver\pgsql;
+namespace Drupal\Tests\pgsql\Unit;
 
 use Drupal\pgsql\Driver\Database\pgsql\Schema;
 use Drupal\Tests\UnitTestCase;
@@ -11,7 +11,7 @@
  * @coversDefaultClass \Drupal\pgsql\Driver\Database\pgsql\Schema
  * @group Database
  */
-class PostgresqlSchemaTest extends UnitTestCase {
+class SchemaTest extends UnitTestCase {
 
   /**
    * The PostgreSql DB connection.
diff --git a/core/tests/Drupal/Tests/Core/Database/Driver/sqlite/ConnectionTest.php b/core/modules/sqlite/tests/src/Unit/ConnectionTest.php
similarity index 96%
rename from core/tests/Drupal/Tests/Core/Database/Driver/sqlite/ConnectionTest.php
rename to core/modules/sqlite/tests/src/Unit/ConnectionTest.php
index 3e52d6aecca88a5471b9468d80ca6c960c8651c2..1555d83f112eac0f09584ccf0c60c5be7c7aff49 100644
--- a/core/tests/Drupal/Tests/Core/Database/Driver/sqlite/ConnectionTest.php
+++ b/core/modules/sqlite/tests/src/Unit/ConnectionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\Core\Database\Driver\sqlite;
+namespace Drupal\Tests\sqlite\Unit;
 
 use Drupal\sqlite\Driver\Database\sqlite\Connection;
 use Drupal\Tests\Core\Database\Stub\StubPDO;