diff --git a/core/lib/Drupal/Core/Database/Connection.php b/core/lib/Drupal/Core/Database/Connection.php
index 358fa71..94396e0 100644
--- a/core/lib/Drupal/Core/Database/Connection.php
+++ b/core/lib/Drupal/Core/Database/Connection.php
@@ -659,15 +659,22 @@ protected function expandArguments(&$query, &$args) {
    */
   public function getDriverClass($class) {
     if (empty($this->driverClasses[$class])) {
-      $driver = $this->driver();
+      $namespaces = ['', 'Drupal\\Core\\Database', 'Drupal\\Core\\Database\\Query'];
       if (!empty($this->connectionOptions['namespace'])) {
-        $driver_class  = $this->connectionOptions['namespace'] . '\\' . $class;
+        $namespaces[] = $this->connectionOptions['namespace'];
       }
       else {
         // Fallback for Drupal 7 settings.php.
-        $driver_class = "Drupal\\Core\\Database\\Driver\\{$driver}\\{$class}";
+        $namespaces[] = 'Drupal\\Core\\Database\\Driver\\' . $this->driver();
       }
-      $this->driverClasses[$class] = class_exists($driver_class) ? $driver_class : $class;
+      do {
+        if ($namespace = array_pop($namespaces)) {
+          $this->driverClasses[$class] = $namespace . '\\' . $class;
+        }
+        else {
+          $this->driverClasses[$class] = $class;
+        }
+      } while (!class_exists($this->driverClasses[$class]) && $namespaces);
     }
     return $this->driverClasses[$class];
   }
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Delete.php b/core/lib/Drupal/Core/Database/Driver/mysql/Delete.php
deleted file mode 100644
index de0db11..0000000
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Delete.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\Core\Database\Driver\mysql\Delete
- */
-
-namespace Drupal\Core\Database\Driver\mysql;
-
-use Drupal\Core\Database\Query\Delete as QueryDelete;
-
-class Delete extends QueryDelete { }
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Merge.php b/core/lib/Drupal/Core/Database/Driver/mysql/Merge.php
deleted file mode 100644
index c48b830..0000000
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Merge.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\Core\Database\Driver\mysql\Merge
- */
-
-namespace Drupal\Core\Database\Driver\mysql;
-
-use Drupal\Core\Database\Query\Merge as QueryMerge;
-
-class Merge extends QueryMerge { }
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Select.php b/core/lib/Drupal/Core/Database/Driver/mysql/Select.php
deleted file mode 100644
index aecae55..0000000
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Select.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\Core\Database\Driver\mysql\Select
- */
-
-namespace Drupal\Core\Database\Driver\mysql;
-
-use Drupal\Core\Database\Query\Select as QuerySelect;
-
-class Select extends QuerySelect { }
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Transaction.php b/core/lib/Drupal/Core/Database/Driver/mysql/Transaction.php
deleted file mode 100644
index 570a130..0000000
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Transaction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\Core\Database\Driver\mysql\Transaction
- */
-
-namespace Drupal\Core\Database\Driver\mysql;
-
-use Drupal\Core\Database\Transaction as DatabaseTransaction;
-
-class Transaction extends DatabaseTransaction { }
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Truncate.php b/core/lib/Drupal/Core/Database/Driver/mysql/Truncate.php
deleted file mode 100644
index c7d7a36..0000000
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Truncate.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\Core\Database\Driver\mysql\Truncate
- */
-
-namespace Drupal\Core\Database\Driver\mysql;
-
-use Drupal\Core\Database\Query\Truncate as QueryTruncate;
-
-class Truncate extends QueryTruncate { }
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Update.php b/core/lib/Drupal/Core/Database/Driver/mysql/Update.php
deleted file mode 100644
index 5b3bda6..0000000
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Update.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\Core\Database\Driver\mysql\Update
- */
-
-namespace Drupal\Core\Database\Driver\mysql;
-
-use Drupal\Core\Database\Query\Update as QueryUpdate;
-
-class Update extends QueryUpdate { }
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Merge.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Merge.php
deleted file mode 100644
index c3a2ae0..0000000
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Merge.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\Core\Database\Driver\pgsql\Merge
- */
-
-namespace Drupal\Core\Database\Driver\pgsql;
-
-use Drupal\Core\Database\Query\Merge as QueryMerge;
-
-class Merge extends QueryMerge { }
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Transaction.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Transaction.php
deleted file mode 100644
index 8c3f701..0000000
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Transaction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\Core\Database\Driver\pgsql\Transaction
- */
-
-namespace Drupal\Core\Database\Driver\pgsql;
-
-use Drupal\Core\Database\Transaction as DatabaseTransaction;
-
-class Transaction extends DatabaseTransaction { }
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Merge.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Merge.php
deleted file mode 100644
index 3bbc3de..0000000
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Merge.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\Core\Database\Driver\sqlite\Merge
- */
-
-namespace Drupal\Core\Database\Driver\sqlite;
-
-use Drupal\Core\Database\Query\Merge as QueryMerge;
-
-class Merge extends QueryMerge { }
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Transaction.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Transaction.php
deleted file mode 100644
index ae73ed8..0000000
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Transaction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\Core\Database\Driver\sqlite\Transaction
- */
-
-namespace Drupal\Core\Database\Driver\sqlite;
-
-use Drupal\Core\Database\Transaction as DatabaseTransaction;
-
-class Transaction extends DatabaseTransaction { }
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Update.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Update.php
deleted file mode 100644
index fa7d54b..0000000
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Update.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\Core\Database\Driver\sqlite\Update
- */
-
-namespace Drupal\Core\Database\Driver\sqlite;
-
-use Drupal\Core\Database\Query\Update as QueryUpdate;
-
-class Update extends QueryUpdate { }
diff --git a/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php b/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php
index cba899b..3093b01 100644
--- a/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php
+++ b/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php
@@ -161,8 +161,8 @@ public function providerGetDriverClass() {
         'nonexistent_class',
       ),
       array(
-        'Drupal\\Core\\Database\\Driver\\mysql\\Select',
-        'mysql',
+        'Drupal\\Core\\Database\\Driver\\pgsql\\Select',
+        'pgsql',
         NULL,
         'Select',
       ),