diff --git a/tests/framework/data/ActiveDataProviderTest.php b/tests/framework/data/ActiveDataProviderTest.php
index f62b0122c4..94f52e80d9 100644
--- a/tests/framework/data/ActiveDataProviderTest.php
+++ b/tests/framework/data/ActiveDataProviderTest.php
@@ -22,7 +22,7 @@ use yiiunit\data\ar\Order;
  * @group data
  * @group db
  */
-class ActiveDataProviderTest extends DatabaseTestCase
+abstract class ActiveDataProviderTest extends DatabaseTestCase
 {
     protected function setUp()
     {
diff --git a/tests/framework/db/ActiveRecordTest.php b/tests/framework/db/ActiveRecordTest.php
index 3c3ce4c9a2..3db0e646f7 100644
--- a/tests/framework/db/ActiveRecordTest.php
+++ b/tests/framework/db/ActiveRecordTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace yiiunit\framework\db;
 
 use yii\db\ActiveQuery;
@@ -16,16 +17,12 @@ use yiiunit\data\ar\OrderWithNullFK;
 use yiiunit\data\ar\Profile;
 use yiiunit\data\ar\Type;
 use yiiunit\framework\ar\ActiveRecordTestTrait;
-use yiiunit\framework\db\cubrid\CubridActiveRecordTest;
+use yiiunit\framework\db\cubrid\ActiveRecordTest as CubridActiveRecordTest;
 use yiiunit\data\ar\Animal;
 use yiiunit\data\ar\Cat;
 use yiiunit\data\ar\Dog;
 
-/**
- * @group db
- * @group mysql
- */
-class ActiveRecordTest extends DatabaseTestCase
+abstract class ActiveRecordTest extends DatabaseTestCase
 {
     use ActiveRecordTestTrait;
 
diff --git a/tests/framework/db/BatchQueryResultTest.php b/tests/framework/db/BatchQueryResultTest.php
index b5b10b3f76..9a4117377a 100644
--- a/tests/framework/db/BatchQueryResultTest.php
+++ b/tests/framework/db/BatchQueryResultTest.php
@@ -1,9 +1,4 @@
 <?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
 
 namespace yiiunit\framework\db;
 
@@ -13,11 +8,7 @@ use yii\db\Query;
 use yii\db\BatchQueryResult;
 use yiiunit\data\ar\Customer;
 
-/**
- * @group db
- * @group mysql
- */
-class BatchQueryResultTest extends DatabaseTestCase
+abstract class BatchQueryResultTest extends DatabaseTestCase
 {
     public function setUp()
     {
diff --git a/tests/framework/db/ColumnSchemaBuilderTest.php b/tests/framework/db/ColumnSchemaBuilderTest.php
index 3cb792899d..3ba595f66e 100644
--- a/tests/framework/db/ColumnSchemaBuilderTest.php
+++ b/tests/framework/db/ColumnSchemaBuilderTest.php
@@ -1,22 +1,13 @@
 <?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
 
 namespace yiiunit\framework\db;
 
-
 use yii\db\ColumnSchemaBuilder;
 use yii\db\Expression;
 use yii\db\Schema;
 use yiiunit\TestCase;
 
-/**
- * ColumnSchemaBuilderTest tests ColumnSchemaBuilder
- */
-class ColumnSchemaBuilderTest extends TestCase
+abstract class ColumnSchemaBuilderTest extends TestCase
 {
     /**
      * @param string $type
diff --git a/tests/framework/db/ColumnSchemaTest.php b/tests/framework/db/ColumnSchemaTest.php
deleted file mode 100644
index 1a32a912c9..0000000000
--- a/tests/framework/db/ColumnSchemaTest.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yiiunit\framework\db;
-
-
-use yii\db\ColumnSchema;
-use yii\db\Schema;
-use yiiunit\TestCase;
-
-/**
- * ColumnSchemaTest tests ColumnSchema
- */
-class ColumnSchemaTest extends TestCase
-{
-    public function testDbTypecastWithEmptyCharType()
-    {
-        $columnSchema = new ColumnSchema(['type' => Schema::TYPE_CHAR]);
-        $this->assertSame('', $columnSchema->dbTypecast(''));
-    }
-}
diff --git a/tests/framework/db/CommandTest.php b/tests/framework/db/CommandTest.php
index 585ec0f9f4..aefd6193a9 100644
--- a/tests/framework/db/CommandTest.php
+++ b/tests/framework/db/CommandTest.php
@@ -8,11 +8,7 @@ use yii\db\DataReader;
 use yii\db\Expression;
 use yii\db\Schema;
 
-/**
- * @group db
- * @group mysql
- */
-class CommandTest extends DatabaseTestCase
+abstract class CommandTest extends DatabaseTestCase
 {
     public function testConstruct()
     {
diff --git a/tests/framework/db/ConnectionTest.php b/tests/framework/db/ConnectionTest.php
index 444fbd8885..5bb6444d6b 100644
--- a/tests/framework/db/ConnectionTest.php
+++ b/tests/framework/db/ConnectionTest.php
@@ -5,11 +5,7 @@ namespace yiiunit\framework\db;
 use yii\db\Connection;
 use yii\db\Transaction;
 
-/**
- * @group db
- * @group mysql
- */
-class ConnectionTest extends DatabaseTestCase
+abstract class ConnectionTest extends DatabaseTestCase
 {
 
     public function testConstruct()
diff --git a/tests/framework/db/DatabaseTestCase.php b/tests/framework/db/DatabaseTestCase.php
index ec80f95ceb..774371e087 100644
--- a/tests/framework/db/DatabaseTestCase.php
+++ b/tests/framework/db/DatabaseTestCase.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace yiiunit\framework\db;
 
 use yii\db\Connection;
@@ -7,14 +8,22 @@ use yiiunit\TestCase as TestCase;
 abstract class DatabaseTestCase extends TestCase
 {
     protected $database;
-    protected $driverName = 'mysql';
+    /**
+     * @var string the driver name of this test class. Must be set by a subclass.
+     */
+    protected $driverName;
     /**
      * @var Connection
      */
     private $_db;
 
+
     protected function setUp()
     {
+        if ($this->driverName === null) {
+            throw new \Exception('driverName is not set for a DatabaseTestCase.');
+        }
+
         parent::setUp();
         $databases = self::getParam('databases');
         $this->database = $databases[$this->driverName];
diff --git a/tests/framework/db/QueryTest.php b/tests/framework/db/QueryTest.php
index 660ce099dc..020c4907e2 100644
--- a/tests/framework/db/QueryTest.php
+++ b/tests/framework/db/QueryTest.php
@@ -5,11 +5,7 @@ namespace yiiunit\framework\db;
 use yii\db\Expression;
 use yii\db\Query;
 
-/**
- * @group db
- * @group mysql
- */
-class QueryTest extends DatabaseTestCase
+abstract class QueryTest extends DatabaseTestCase
 {
     public function testSelect()
     {
diff --git a/tests/framework/db/SchemaTest.php b/tests/framework/db/SchemaTest.php
index 4fa1352f66..a2dd590023 100644
--- a/tests/framework/db/SchemaTest.php
+++ b/tests/framework/db/SchemaTest.php
@@ -4,14 +4,11 @@ namespace yiiunit\framework\db;
 
 use PDO;
 use yii\caching\FileCache;
+use yii\db\ColumnSchema;
 use yii\db\Expression;
 use yii\db\Schema;
 
-/**
- * @group db
- * @group mysql
- */
-class SchemaTest extends DatabaseTestCase
+abstract class SchemaTest extends DatabaseTestCase
 {
     public function pdoAttributesProvider()
     {
@@ -373,4 +370,11 @@ class SchemaTest extends DatabaseTestCase
             }
         }
     }
+
+    public function testColumnSchemaDbTypecastWithEmptyCharType()
+    {
+        $columnSchema = new ColumnSchema(['type' => Schema::TYPE_CHAR]);
+        $this->assertSame('', $columnSchema->dbTypecast(''));
+    }
+
 }
diff --git a/tests/framework/db/cubrid/CubridActiveDataProviderTest.php b/tests/framework/db/cubrid/ActiveDataProviderTest.php
similarity index 54%
rename from tests/framework/db/cubrid/CubridActiveDataProviderTest.php
rename to tests/framework/db/cubrid/ActiveDataProviderTest.php
index f01e69f087..8a36d67b32 100644
--- a/tests/framework/db/cubrid/CubridActiveDataProviderTest.php
+++ b/tests/framework/db/cubrid/ActiveDataProviderTest.php
@@ -1,14 +1,13 @@
 <?php
-namespace yiiunit\framework\db\cubrid;
 
-use yiiunit\framework\data\ActiveDataProviderTest;
+namespace yiiunit\framework\db\cubrid;
 
 /**
  * @group db
  * @group cubrid
  * @group data
  */
-class CubridActiveDataProviderTest extends ActiveDataProviderTest
+class ActiveDataProviderTest extends \yiiunit\framework\data\ActiveDataProviderTest
 {
     public $driverName = 'cubrid';
 }
diff --git a/tests/framework/db/cubrid/CubridQueryTest.php b/tests/framework/db/cubrid/ActiveRecordTest.php
similarity index 62%
rename from tests/framework/db/cubrid/CubridQueryTest.php
rename to tests/framework/db/cubrid/ActiveRecordTest.php
index 50fe0d8887..5764dc7720 100644
--- a/tests/framework/db/cubrid/CubridQueryTest.php
+++ b/tests/framework/db/cubrid/ActiveRecordTest.php
@@ -1,13 +1,12 @@
 <?php
-namespace yiiunit\framework\db\cubrid;
 
-use yiiunit\framework\db\QueryTest;
+namespace yiiunit\framework\db\cubrid;
 
 /**
  * @group db
  * @group cubrid
  */
-class CubridQueryTest extends QueryTest
+class ActiveRecordTest extends \yiiunit\framework\db\ActiveRecordTest
 {
     public $driverName = 'cubrid';
 }
diff --git a/tests/framework/db/cubrid/CubridActiveRecordTest.php b/tests/framework/db/cubrid/BatchQueryResultTest.php
similarity index 56%
rename from tests/framework/db/cubrid/CubridActiveRecordTest.php
rename to tests/framework/db/cubrid/BatchQueryResultTest.php
index ff362f3235..bc1a853100 100644
--- a/tests/framework/db/cubrid/CubridActiveRecordTest.php
+++ b/tests/framework/db/cubrid/BatchQueryResultTest.php
@@ -1,13 +1,12 @@
 <?php
-namespace yiiunit\framework\db\cubrid;
 
-use yiiunit\framework\db\ActiveRecordTest;
+namespace yiiunit\framework\db\cubrid;
 
 /**
  * @group db
  * @group cubrid
  */
-class CubridActiveRecordTest extends ActiveRecordTest
+class BatchQueryResultTest extends \yiiunit\framework\db\BatchQueryResultTest
 {
     public $driverName = 'cubrid';
 }
diff --git a/tests/framework/db/cubrid/ColumnSchemaBuilderTest.php b/tests/framework/db/cubrid/ColumnSchemaBuilderTest.php
index c9f0cf8071..734f0d3021 100644
--- a/tests/framework/db/cubrid/ColumnSchemaBuilderTest.php
+++ b/tests/framework/db/cubrid/ColumnSchemaBuilderTest.php
@@ -1,14 +1,16 @@
 <?php
+
 namespace yiiunit\framework\db\cubrid;
 
 use yii\db\cubrid\ColumnSchemaBuilder;
 use yii\db\Schema;
-use \yiiunit\framework\db\ColumnSchemaBuilderTest as BaseColumnSchemaBuilderTest;
 
 /**
  * ColumnSchemaBuilderTest tests ColumnSchemaBuilder for Cubrid
+ * @group db
+ * @group cubrid
  */
-class ColumnSchemaBuilderTest extends BaseColumnSchemaBuilderTest
+class ColumnSchemaBuilderTest extends \yiiunit\framework\db\ColumnSchemaBuilderTest
 {
     /**
      * @param string $type
diff --git a/tests/framework/db/cubrid/CubridCommandTest.php b/tests/framework/db/cubrid/CommandTest.php
similarity index 97%
rename from tests/framework/db/cubrid/CubridCommandTest.php
rename to tests/framework/db/cubrid/CommandTest.php
index b8b5656a62..72eb02536d 100644
--- a/tests/framework/db/cubrid/CubridCommandTest.php
+++ b/tests/framework/db/cubrid/CommandTest.php
@@ -1,13 +1,12 @@
 <?php
-namespace yiiunit\framework\db\cubrid;
 
-use yiiunit\framework\db\CommandTest;
+namespace yiiunit\framework\db\cubrid;
 
 /**
  * @group db
  * @group cubrid
  */
-class CubridCommandTest extends CommandTest
+class CommandTest extends \yiiunit\framework\db\CommandTest
 {
     public $driverName = 'cubrid';
 
diff --git a/tests/framework/db/cubrid/CubridConnectionTest.php b/tests/framework/db/cubrid/ConnectionTest.php
similarity index 97%
rename from tests/framework/db/cubrid/CubridConnectionTest.php
rename to tests/framework/db/cubrid/ConnectionTest.php
index 7dbd0f3749..dd930d10d9 100644
--- a/tests/framework/db/cubrid/CubridConnectionTest.php
+++ b/tests/framework/db/cubrid/ConnectionTest.php
@@ -1,13 +1,12 @@
 <?php
-namespace yiiunit\framework\db\cubrid;
 
-use yiiunit\framework\db\ConnectionTest;
+namespace yiiunit\framework\db\cubrid;
 
 /**
  * @group db
  * @group cubrid
  */
-class CubridConnectionTest extends ConnectionTest
+class ConnectionTest extends \yiiunit\framework\db\ConnectionTest
 {
     public $driverName = 'cubrid';
 
diff --git a/tests/framework/db/cubrid/CubridQueryBuilderTest.php b/tests/framework/db/cubrid/QueryBuilderTest.php
similarity index 82%
rename from tests/framework/db/cubrid/CubridQueryBuilderTest.php
rename to tests/framework/db/cubrid/QueryBuilderTest.php
index 1211fadf33..fbd886628c 100644
--- a/tests/framework/db/cubrid/CubridQueryBuilderTest.php
+++ b/tests/framework/db/cubrid/QueryBuilderTest.php
@@ -3,13 +3,12 @@
 namespace yiiunit\framework\db\cubrid;
 
 use yii\db\Schema;
-use yiiunit\framework\db\QueryBuilderTest;
 
 /**
  * @group db
  * @group cubrid
  */
-class CubridQueryBuilderTest extends QueryBuilderTest
+class QueryBuilderTest extends \yiiunit\framework\db\QueryBuilderTest
 {
     public $driverName = 'cubrid';
 
diff --git a/tests/framework/db/cubrid/QueryTest.php b/tests/framework/db/cubrid/QueryTest.php
new file mode 100644
index 0000000000..0edbbffc48
--- /dev/null
+++ b/tests/framework/db/cubrid/QueryTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace yiiunit\framework\db\cubrid;
+
+/**
+ * @group db
+ * @group cubrid
+ */
+class QueryTest extends \yiiunit\framework\db\QueryTest
+{
+    public $driverName = 'cubrid';
+}
diff --git a/tests/framework/db/cubrid/CubridSchemaTest.php b/tests/framework/db/cubrid/SchemaTest.php
similarity index 96%
rename from tests/framework/db/cubrid/CubridSchemaTest.php
rename to tests/framework/db/cubrid/SchemaTest.php
index 369097e8df..712f7a8b48 100644
--- a/tests/framework/db/cubrid/CubridSchemaTest.php
+++ b/tests/framework/db/cubrid/SchemaTest.php
@@ -1,14 +1,14 @@
 <?php
+
 namespace yiiunit\framework\db\cubrid;
 
 use yii\db\Expression;
-use yiiunit\framework\db\SchemaTest;
 
 /**
  * @group db
  * @group cubrid
  */
-class CubridSchemaTest extends SchemaTest
+class SchemaTest extends \yiiunit\framework\db\SchemaTest
 {
     public $driverName = 'cubrid';
 
diff --git a/tests/framework/db/mssql/MssqlActiveDataProviderTest.php b/tests/framework/db/mssql/ActiveDataProviderTest.php
similarity index 54%
rename from tests/framework/db/mssql/MssqlActiveDataProviderTest.php
rename to tests/framework/db/mssql/ActiveDataProviderTest.php
index e9f49943c6..2c84e8c14c 100644
--- a/tests/framework/db/mssql/MssqlActiveDataProviderTest.php
+++ b/tests/framework/db/mssql/ActiveDataProviderTest.php
@@ -1,14 +1,13 @@
 <?php
-namespace yiiunit\framework\db\mssql;
 
-use yiiunit\framework\data\ActiveDataProviderTest;
+namespace yiiunit\framework\db\mssql;
 
 /**
  * @group db
  * @group mssql
  * @group data
  */
-class MssqlActiveDataProviderTest extends ActiveDataProviderTest
+class ActiveDataProviderTest extends \yiiunit\framework\data\ActiveDataProviderTest
 {
     public $driverName = 'sqlsrv';
 }
diff --git a/tests/framework/db/mssql/MssqlActiveRecordTest.php b/tests/framework/db/mssql/ActiveRecordTest.php
similarity index 64%
rename from tests/framework/db/mssql/MssqlActiveRecordTest.php
rename to tests/framework/db/mssql/ActiveRecordTest.php
index d836e76f9d..0e847344b8 100644
--- a/tests/framework/db/mssql/MssqlActiveRecordTest.php
+++ b/tests/framework/db/mssql/ActiveRecordTest.php
@@ -2,15 +2,13 @@
 
 namespace yiiunit\framework\db\mssql;
 
-use yiiunit\framework\db\ActiveRecordTest;
-
 /**
  * @group db
  * @group mssql
  */
-class MssqlActiveRecordTest extends ActiveRecordTest
+class ActiveRecordTest extends \yiiunit\framework\db\ActiveRecordTest
 {
-    protected $driverName = 'sqlsrv';
+    public $driverName = 'sqlsrv';
 
     public function testExplicitPkOnAutoIncrement()
     {
diff --git a/tests/framework/db/mssql/BatchQueryResultTest.php b/tests/framework/db/mssql/BatchQueryResultTest.php
new file mode 100644
index 0000000000..375d413962
--- /dev/null
+++ b/tests/framework/db/mssql/BatchQueryResultTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace yiiunit\framework\db\mssql;
+
+/**
+ * @group db
+ * @group mssql
+ */
+class BatchQueryResultTest extends \yiiunit\framework\db\BatchQueryResultTest
+{
+    public $driverName = 'sqlsrv';
+}
diff --git a/tests/framework/db/mssql/ColumnSchemaBuilderTest.php b/tests/framework/db/mssql/ColumnSchemaBuilderTest.php
new file mode 100644
index 0000000000..bbec36166b
--- /dev/null
+++ b/tests/framework/db/mssql/ColumnSchemaBuilderTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace yiiunit\framework\db\mssql;
+
+use yii\db\ColumnSchemaBuilder;
+use yii\db\Schema;
+
+/**
+ * ColumnSchemaBuilderTest tests ColumnSchemaBuilder for MSSQL
+ * @group db
+ * @group mssql
+ */
+class ColumnSchemaBuilderTest extends \yiiunit\framework\db\ColumnSchemaBuilderTest
+{
+    /**
+     * @param string $type
+     * @param integer $length
+     * @return ColumnSchemaBuilder
+     */
+    public function getColumnSchemaBuilder($type, $length = null)
+    {
+        return new ColumnSchemaBuilder($type, $length);
+    }
+}
diff --git a/tests/framework/db/mssql/MssqlCommandTest.php b/tests/framework/db/mssql/CommandTest.php
similarity index 97%
rename from tests/framework/db/mssql/MssqlCommandTest.php
rename to tests/framework/db/mssql/CommandTest.php
index a889f4a3e8..99e95c129c 100644
--- a/tests/framework/db/mssql/MssqlCommandTest.php
+++ b/tests/framework/db/mssql/CommandTest.php
@@ -3,13 +3,12 @@
 namespace yiiunit\framework\db\mssql;
 
 use yii\db\Schema;
-use yiiunit\framework\db\CommandTest;
 
 /**
  * @group db
  * @group mssql
  */
-class MssqlCommandTest extends CommandTest
+class CommandTest extends \yiiunit\framework\db\CommandTest
 {
     protected $driverName = 'sqlsrv';
 
diff --git a/tests/framework/db/mssql/MssqlConnectionTest.php b/tests/framework/db/mssql/ConnectionTest.php
similarity index 97%
rename from tests/framework/db/mssql/MssqlConnectionTest.php
rename to tests/framework/db/mssql/ConnectionTest.php
index 8a3a214d81..3658b4ca05 100644
--- a/tests/framework/db/mssql/MssqlConnectionTest.php
+++ b/tests/framework/db/mssql/ConnectionTest.php
@@ -2,13 +2,11 @@
 
 namespace yiiunit\framework\db\mssql;
 
-use yiiunit\framework\db\ConnectionTest;
-
 /**
  * @group db
  * @group mssql
  */
-class MssqlConnectionTest extends ConnectionTest
+class ConnectionTest extends \yiiunit\framework\db\ConnectionTest
 {
     protected $driverName = 'sqlsrv';
 
diff --git a/tests/framework/db/mssql/MssqlQueryBuilderTest.php b/tests/framework/db/mssql/QueryBuilderTest.php
similarity index 97%
rename from tests/framework/db/mssql/MssqlQueryBuilderTest.php
rename to tests/framework/db/mssql/QueryBuilderTest.php
index 404079e7c6..430d73de1f 100644
--- a/tests/framework/db/mssql/MssqlQueryBuilderTest.php
+++ b/tests/framework/db/mssql/QueryBuilderTest.php
@@ -3,14 +3,13 @@
 namespace yiiunit\framework\db\mssql;
 
 use yii\db\mssql\Schema;
-use yiiunit\framework\db\QueryBuilderTest;
 use yii\db\Query;
 
 /**
  * @group db
  * @group mssql
  */
-class MssqlQueryBuilderTest extends QueryBuilderTest
+class QueryBuilderTest extends \yiiunit\framework\db\QueryBuilderTest
 {
     public $driverName = 'sqlsrv';
 
diff --git a/tests/framework/db/mssql/MssqlQueryTest.php b/tests/framework/db/mssql/QueryTest.php
similarity index 62%
rename from tests/framework/db/mssql/MssqlQueryTest.php
rename to tests/framework/db/mssql/QueryTest.php
index 89830d036d..4fcdc23abb 100644
--- a/tests/framework/db/mssql/MssqlQueryTest.php
+++ b/tests/framework/db/mssql/QueryTest.php
@@ -2,13 +2,11 @@
 
 namespace yiiunit\framework\db\mssql;
 
-use yiiunit\framework\db\QueryTest;
-
 /**
  * @group db
  * @group mssql
  */
-class MssqlQueryTest extends QueryTest
+class QueryTest extends \yiiunit\framework\db\QueryTest
 {
     protected $driverName = 'sqlsrv';
 }
diff --git a/tests/framework/db/mssql/SchemaTest.php b/tests/framework/db/mssql/SchemaTest.php
new file mode 100644
index 0000000000..83b192ad2d
--- /dev/null
+++ b/tests/framework/db/mssql/SchemaTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace yiiunit\framework\db\mssql;
+
+/**
+ * @group db
+ * @group mssql
+ */
+class SchemaTest extends \yiiunit\framework\db\SchemaTest
+{
+    public $driverName = 'sqlsrv';
+}
diff --git a/tests/framework/db/mysql/ActiveDataProviderTest.php b/tests/framework/db/mysql/ActiveDataProviderTest.php
new file mode 100644
index 0000000000..5f2c99e203
--- /dev/null
+++ b/tests/framework/db/mysql/ActiveDataProviderTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace yiiunit\framework\db\mysql;
+
+/**
+ * @group db
+ * @group mysql
+ * @group data
+ */
+class ActiveDataProviderTest extends \yiiunit\framework\data\ActiveDataProviderTest
+{
+    public $driverName = 'mysql';
+}
diff --git a/tests/framework/db/mysql/ActiveRecordTest.php b/tests/framework/db/mysql/ActiveRecordTest.php
new file mode 100644
index 0000000000..63e28a2bfc
--- /dev/null
+++ b/tests/framework/db/mysql/ActiveRecordTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace yiiunit\framework\db\mysql;
+
+/**
+ * @group db
+ * @group mysql
+ */
+class ActiveRecordTest extends \yiiunit\framework\db\ActiveRecordTest
+{
+    public $driverName = 'mysql';
+}
diff --git a/tests/framework/db/mysql/BatchQueryResultTest.php b/tests/framework/db/mysql/BatchQueryResultTest.php
new file mode 100644
index 0000000000..9d4fdcfbcc
--- /dev/null
+++ b/tests/framework/db/mysql/BatchQueryResultTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace yiiunit\framework\db\mysql;
+
+/**
+ * @group db
+ * @group mysql
+ */
+class BatchQueryResultTest extends \yiiunit\framework\db\BatchQueryResultTest
+{
+    public $driverName = 'mysql';
+}
diff --git a/tests/framework/db/mysql/ColumnSchemaBuilderTest.php b/tests/framework/db/mysql/ColumnSchemaBuilderTest.php
index 7723bec1e5..8dcde35c21 100644
--- a/tests/framework/db/mysql/ColumnSchemaBuilderTest.php
+++ b/tests/framework/db/mysql/ColumnSchemaBuilderTest.php
@@ -1,14 +1,16 @@
 <?php
+
 namespace yiiunit\framework\db\mysql;
 
 use yii\db\mysql\ColumnSchemaBuilder;
 use yii\db\Schema;
-use \yiiunit\framework\db\ColumnSchemaBuilderTest as BaseColumnSchemaBuilderTest;
 
 /**
  * ColumnSchemaBuilderTest tests ColumnSchemaBuilder for MySQL
+ * @group db
+ * @group mysql
  */
-class ColumnSchemaBuilderTest extends BaseColumnSchemaBuilderTest
+class ColumnSchemaBuilderTest extends \yiiunit\framework\db\ColumnSchemaBuilderTest
 {
     /**
      * @param string $type
diff --git a/tests/framework/db/mysql/CommandTest.php b/tests/framework/db/mysql/CommandTest.php
new file mode 100644
index 0000000000..6e26ffb17f
--- /dev/null
+++ b/tests/framework/db/mysql/CommandTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace yiiunit\framework\db\mysql;
+
+/**
+ * @group db
+ * @group mysql
+ */
+class CommandTest extends \yiiunit\framework\db\CommandTest
+{
+    public $driverName = 'mysql';
+}
diff --git a/tests/framework/db/mysql/ConnectionTest.php b/tests/framework/db/mysql/ConnectionTest.php
new file mode 100644
index 0000000000..f0fe799694
--- /dev/null
+++ b/tests/framework/db/mysql/ConnectionTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace yiiunit\framework\db\mysql;
+
+/**
+ * @group db
+ * @group mysql
+ */
+class ConnectionTest extends \yiiunit\framework\db\ConnectionTest
+{
+    protected $driverName = 'mysql';
+}
diff --git a/tests/framework/db/mysql/MysqlQueryBuilderTest.php b/tests/framework/db/mysql/QueryBuilderTest.php
similarity index 94%
rename from tests/framework/db/mysql/MysqlQueryBuilderTest.php
rename to tests/framework/db/mysql/QueryBuilderTest.php
index e0ea3fe724..4ba9904246 100644
--- a/tests/framework/db/mysql/MysqlQueryBuilderTest.php
+++ b/tests/framework/db/mysql/QueryBuilderTest.php
@@ -3,14 +3,15 @@
 namespace yiiunit\framework\db\mysql;
 
 use yii\db\Schema;
-use yiiunit\framework\db\QueryBuilderTest;
 
 /**
  * @group db
  * @group mysql
  */
-class MysqlQueryBuilderTest extends QueryBuilderTest
+class QueryBuilderTest extends \yiiunit\framework\db\QueryBuilderTest
 {
+	protected $driverName = 'mysql';
+
     /**
      * this is not used as a dataprovider for testGetColumnType to speed up the test
      * when used as dataprovider every single line will cause a reconnect with the database which is not needed here
diff --git a/tests/framework/db/mysql/QueryTest.php b/tests/framework/db/mysql/QueryTest.php
new file mode 100644
index 0000000000..64b2c72f28
--- /dev/null
+++ b/tests/framework/db/mysql/QueryTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace yiiunit\framework\db\mysql;
+
+/**
+ * @group db
+ * @group mysql
+ */
+class QueryTest extends \yiiunit\framework\db\QueryTest
+{
+    protected $driverName = 'mysql';
+}
diff --git a/tests/framework/db/mysql/SchemaTest.php b/tests/framework/db/mysql/SchemaTest.php
new file mode 100644
index 0000000000..b103632e5d
--- /dev/null
+++ b/tests/framework/db/mysql/SchemaTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace yiiunit\framework\db\mysql;
+
+/**
+ * @group db
+ * @group mysql
+ */
+class SchemaTest extends \yiiunit\framework\db\SchemaTest
+{
+    public $driverName = 'mysql';
+}
diff --git a/tests/framework/db/oci/ActiveDataProviderTest.php b/tests/framework/db/oci/ActiveDataProviderTest.php
new file mode 100644
index 0000000000..b08cfbbf5c
--- /dev/null
+++ b/tests/framework/db/oci/ActiveDataProviderTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace yiiunit\framework\db\oci;
+
+/**
+ * @group db
+ * @group oci
+ * @group data
+ */
+class ActiveDataProviderTest extends \yiiunit\framework\data\ActiveDataProviderTest
+{
+    public $driverName = 'oci';
+}
diff --git a/tests/framework/db/oci/OracleActiveRecordTest.php b/tests/framework/db/oci/ActiveRecordTest.php
similarity index 97%
rename from tests/framework/db/oci/OracleActiveRecordTest.php
rename to tests/framework/db/oci/ActiveRecordTest.php
index 30d6742098..6cf047536d 100644
--- a/tests/framework/db/oci/OracleActiveRecordTest.php
+++ b/tests/framework/db/oci/ActiveRecordTest.php
@@ -1,7 +1,7 @@
 <?php
+
 namespace yiiunit\framework\db\oci;
 
-use yiiunit\framework\db\ActiveRecordTest;
 use yiiunit\data\ar\DefaultPk;
 use yiiunit\data\ar\Type;
 
@@ -9,7 +9,7 @@ use yiiunit\data\ar\Type;
  * @group db
  * @group oci
  */
-class OracleActiveRecordTest extends ActiveRecordTest
+class ActiveRecordTest extends \yiiunit\framework\db\ActiveRecordTest
 {
     protected $driverName = 'oci';
 
diff --git a/tests/framework/db/oci/BatchQueryResultTest.php b/tests/framework/db/oci/BatchQueryResultTest.php
new file mode 100644
index 0000000000..5813791c91
--- /dev/null
+++ b/tests/framework/db/oci/BatchQueryResultTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace yiiunit\framework\db\oci;
+
+/**
+ * @group db
+ * @group oci
+ */
+class BatchQueryResultTest extends \yiiunit\framework\db\BatchQueryResultTest
+{
+    public $driverName = 'oci';
+}
diff --git a/tests/framework/db/oci/ColumnSchemaBuilderTest.php b/tests/framework/db/oci/ColumnSchemaBuilderTest.php
index bcfba0128f..f0b6712994 100644
--- a/tests/framework/db/oci/ColumnSchemaBuilderTest.php
+++ b/tests/framework/db/oci/ColumnSchemaBuilderTest.php
@@ -1,14 +1,16 @@
 <?php
+
 namespace yiiunit\framework\db\oci;
 
 use yii\db\oci\ColumnSchemaBuilder;
 use yii\db\Schema;
-use \yiiunit\framework\db\ColumnSchemaBuilderTest as BaseColumnSchemaBuilderTest;
 
 /**
  * ColumnSchemaBuilderTest tests ColumnSchemaBuilder for Oracle
+ * @group db
+ * @group oci
  */
-class ColumnSchemaBuilderTest extends BaseColumnSchemaBuilderTest
+class ColumnSchemaBuilderTest extends \yiiunit\framework\db\ColumnSchemaBuilderTest
 {
     /**
      * @param string $type
diff --git a/tests/framework/db/oci/OracleCommandTest.php b/tests/framework/db/oci/CommandTest.php
similarity index 90%
rename from tests/framework/db/oci/OracleCommandTest.php
rename to tests/framework/db/oci/CommandTest.php
index 435b536e65..80f8abe824 100644
--- a/tests/framework/db/oci/OracleCommandTest.php
+++ b/tests/framework/db/oci/CommandTest.php
@@ -1,14 +1,14 @@
 <?php
+
 namespace yiiunit\framework\db\oci;
 
 use yii\db\Schema;
-use yiiunit\framework\db\CommandTest;
 
 /**
  * @group db
  * @group oci
  */
-class OracleCommandTest extends CommandTest
+class CommandTest extends \yiiunit\framework\db\CommandTest
 {
     protected $driverName = 'oci';
 
diff --git a/tests/framework/db/oci/ConnectionTest.php b/tests/framework/db/oci/ConnectionTest.php
new file mode 100644
index 0000000000..d65b000fb3
--- /dev/null
+++ b/tests/framework/db/oci/ConnectionTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace yiiunit\framework\db\oci;
+
+/**
+ * @group db
+ * @group oci
+ */
+class ConnectionTest extends \yiiunit\framework\db\ConnectionTest
+{
+    protected $driverName = 'oci';
+}
diff --git a/tests/framework/db/oci/OracleActiveDataProviderTest.php b/tests/framework/db/oci/OracleActiveDataProviderTest.php
deleted file mode 100644
index 5e360febf6..0000000000
--- a/tests/framework/db/oci/OracleActiveDataProviderTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-namespace yiiunit\framework\db\oci;
-
-use yiiunit\framework\data\ActiveDataProviderTest;
-use yii\data\ActiveDataProvider;
-use yiiunit\data\ar\Order;
-
-/**
- * @group db
- * @group oci
- * @group data
- */
-class OracleActiveDataProviderTest extends ActiveDataProviderTest
-{
-    public $driverName = 'oci';
-}
diff --git a/tests/framework/db/oci/OracleQueryBuilderTest.php b/tests/framework/db/oci/QueryBuilderTest.php
similarity index 94%
rename from tests/framework/db/oci/OracleQueryBuilderTest.php
rename to tests/framework/db/oci/QueryBuilderTest.php
index 00f200d2b3..fe8f932db1 100644
--- a/tests/framework/db/oci/OracleQueryBuilderTest.php
+++ b/tests/framework/db/oci/QueryBuilderTest.php
@@ -3,13 +3,12 @@
 namespace yiiunit\framework\db\oci;
 
 use yii\db\oci\Schema;
-use yiiunit\framework\db\QueryBuilderTest;
 
 /**
  * @group db
  * @group oci
  */
-class OracleQueryBuilderTest extends QueryBuilderTest
+class QueryBuilderTest extends \yiiunit\framework\db\QueryBuilderTest
 {
     public $driverName = 'oci';
 
diff --git a/tests/framework/db/oci/OracleQueryTest.php b/tests/framework/db/oci/QueryTest.php
similarity index 86%
rename from tests/framework/db/oci/OracleQueryTest.php
rename to tests/framework/db/oci/QueryTest.php
index 4c0e50f805..306e7396d4 100644
--- a/tests/framework/db/oci/OracleQueryTest.php
+++ b/tests/framework/db/oci/QueryTest.php
@@ -1,14 +1,14 @@
 <?php
+
 namespace yiiunit\framework\db\oci;
 
-use yiiunit\framework\db\QueryTest;
 use yii\db\Query;
 
 /**
  * @group db
  * @group oci
  */
-class OracleQueryTest extends QueryTest
+class QueryTest extends \yiiunit\framework\db\QueryTest
 {
     protected $driverName = 'oci';
 
diff --git a/tests/framework/db/oci/OracleSchemaTest.php b/tests/framework/db/oci/SchemaTest.php
similarity index 97%
rename from tests/framework/db/oci/OracleSchemaTest.php
rename to tests/framework/db/oci/SchemaTest.php
index 747d06ed29..267ec247e8 100644
--- a/tests/framework/db/oci/OracleSchemaTest.php
+++ b/tests/framework/db/oci/SchemaTest.php
@@ -4,13 +4,12 @@ namespace yiiunit\framework\db\oci;
 
 use yii\db\Expression;
 use yii\db\oci\Schema;
-use yiiunit\framework\db\SchemaTest;
 
 /**
  * @group db
  * @group oci
  */
-class OracleSchemaTest extends SchemaTest
+class SchemaTest extends \yiiunit\framework\db\SchemaTest
 {
     public $driverName = 'oci';
 
diff --git a/tests/framework/db/pgsql/PostgreSQLActiveDataProviderTest.php b/tests/framework/db/pgsql/ActiveDataProviderTest.php
similarity index 52%
rename from tests/framework/db/pgsql/PostgreSQLActiveDataProviderTest.php
rename to tests/framework/db/pgsql/ActiveDataProviderTest.php
index 081f680bc9..21d9a3bac6 100644
--- a/tests/framework/db/pgsql/PostgreSQLActiveDataProviderTest.php
+++ b/tests/framework/db/pgsql/ActiveDataProviderTest.php
@@ -1,14 +1,13 @@
 <?php
-namespace yiiunit\framework\db\pgsql;
 
-use yiiunit\framework\data\ActiveDataProviderTest;
+namespace yiiunit\framework\db\pgsql;
 
 /**
  * @group db
  * @group pgsql
  * @group data
  */
-class PostgreSQLActiveDataProviderTest extends ActiveDataProviderTest
+class ActiveDataProviderTest extends \yiiunit\framework\data\ActiveDataProviderTest
 {
     public $driverName = 'pgsql';
 }
diff --git a/tests/framework/db/pgsql/PostgreSQLActiveRecordTest.php b/tests/framework/db/pgsql/ActiveRecordTest.php
similarity index 98%
rename from tests/framework/db/pgsql/PostgreSQLActiveRecordTest.php
rename to tests/framework/db/pgsql/ActiveRecordTest.php
index 7a8d7e71b9..22ecfeb12b 100644
--- a/tests/framework/db/pgsql/PostgreSQLActiveRecordTest.php
+++ b/tests/framework/db/pgsql/ActiveRecordTest.php
@@ -7,14 +7,13 @@ use yii\db\pgsql\Schema;
 use yiiunit\data\ar\ActiveRecord;
 use yiiunit\data\ar\DefaultPk;
 use yiiunit\framework\ar\ActiveRecordTestTrait;
-use yiiunit\framework\db\ActiveRecordTest;
 use yiiunit\TestCase;
 
 /**
  * @group db
  * @group pgsql
  */
-class PostgreSQLActiveRecordTest extends ActiveRecordTest
+class ActiveRecordTest extends \yiiunit\framework\db\ActiveRecordTest
 {
     protected $driverName = 'pgsql';
 
diff --git a/tests/framework/db/pgsql/BatchQueryResultTest.php b/tests/framework/db/pgsql/BatchQueryResultTest.php
new file mode 100644
index 0000000000..9261baa557
--- /dev/null
+++ b/tests/framework/db/pgsql/BatchQueryResultTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace yiiunit\framework\db\pgsql;
+
+/**
+ * @group db
+ * @group pgsql
+ */
+class BatchQueryResultTest extends \yiiunit\framework\db\BatchQueryResultTest
+{
+    public $driverName = 'pgsql';
+}
diff --git a/tests/framework/db/pgsql/ColumnSchemaBuilderTest.php b/tests/framework/db/pgsql/ColumnSchemaBuilderTest.php
new file mode 100644
index 0000000000..88b26b4f24
--- /dev/null
+++ b/tests/framework/db/pgsql/ColumnSchemaBuilderTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace yiiunit\framework\db\pgsql;
+
+use yii\db\ColumnSchemaBuilder;
+use yii\db\Schema;
+
+/**
+ * ColumnSchemaBuilderTest tests ColumnSchemaBuilder for Oracle
+ * @group db
+ * @group pgsql
+ */
+class ColumnSchemaBuilderTest extends \yiiunit\framework\db\ColumnSchemaBuilderTest
+{
+    /**
+     * @param string $type
+     * @param integer $length
+     * @return ColumnSchemaBuilder
+     */
+    public function getColumnSchemaBuilder($type, $length = null)
+    {
+        return new ColumnSchemaBuilder($type, $length);
+    }
+}
diff --git a/tests/framework/db/pgsql/PostgreSQLCommandTest.php b/tests/framework/db/pgsql/CommandTest.php
similarity index 97%
rename from tests/framework/db/pgsql/PostgreSQLCommandTest.php
rename to tests/framework/db/pgsql/CommandTest.php
index 50dff3a5f4..7a8a2d55c3 100644
--- a/tests/framework/db/pgsql/PostgreSQLCommandTest.php
+++ b/tests/framework/db/pgsql/CommandTest.php
@@ -1,13 +1,12 @@
 <?php
-namespace yii\tests\unit\framework\db\pgsql;
 
-use yiiunit\framework\db\CommandTest;
+namespace yii\tests\unit\framework\db\pgsql;
 
 /**
  * @group db
  * @group pgsql
  */
-class PostgreSQLCommandTest extends CommandTest
+class CommandTest extends \yiiunit\framework\db\CommandTest
 {
     public $driverName = 'pgsql';
 
diff --git a/tests/framework/db/pgsql/PostgreSQLConnectionTest.php b/tests/framework/db/pgsql/ConnectionTest.php
similarity index 97%
rename from tests/framework/db/pgsql/PostgreSQLConnectionTest.php
rename to tests/framework/db/pgsql/ConnectionTest.php
index 2206b7597c..429c5456e0 100644
--- a/tests/framework/db/pgsql/PostgreSQLConnectionTest.php
+++ b/tests/framework/db/pgsql/ConnectionTest.php
@@ -1,14 +1,14 @@
 <?php
+
 namespace yiiunit\framework\db\pgsql;
 
 use yii\db\Transaction;
-use yiiunit\framework\db\ConnectionTest;
 
 /**
  * @group db
  * @group pgsql
  */
-class PostgreSQLConnectionTest extends ConnectionTest
+class ConnectionTest extends \yiiunit\framework\db\ConnectionTest
 {
     protected $driverName = 'pgsql';
 
diff --git a/tests/framework/db/pgsql/PostgreSQLQueryBuilderTest.php b/tests/framework/db/pgsql/QueryBuilderTest.php
similarity index 97%
rename from tests/framework/db/pgsql/PostgreSQLQueryBuilderTest.php
rename to tests/framework/db/pgsql/QueryBuilderTest.php
index 775f1b591b..c30ec58516 100644
--- a/tests/framework/db/pgsql/PostgreSQLQueryBuilderTest.php
+++ b/tests/framework/db/pgsql/QueryBuilderTest.php
@@ -3,13 +3,12 @@
 namespace yiiunit\framework\db\pgsql;
 
 use yii\db\Schema;
-use yiiunit\framework\db\QueryBuilderTest;
 
 /**
  * @group db
  * @group pgsql
  */
-class PostgreSQLQueryBuilderTest extends QueryBuilderTest
+class QueryBuilderTest extends \yiiunit\framework\db\QueryBuilderTest
 {
     public $driverName = 'pgsql';
 
diff --git a/tests/framework/db/pgsql/PostgreSQLQueryTest.php b/tests/framework/db/pgsql/QueryTest.php
similarity index 92%
rename from tests/framework/db/pgsql/PostgreSQLQueryTest.php
rename to tests/framework/db/pgsql/QueryTest.php
index af2c383d96..bf3de4199a 100644
--- a/tests/framework/db/pgsql/PostgreSQLQueryTest.php
+++ b/tests/framework/db/pgsql/QueryTest.php
@@ -4,14 +4,12 @@ namespace yiiunit\framework\db\pgsql;
 
 use yii\db\pgsql\Schema;
 use yii\db\Query;
-use yiiunit\framework\db\QueryTest;
-use yiiunit\framework\db\SchemaTest;
 
 /**
  * @group db
  * @group pgsql
  */
-class PostgreSQLQueryTest extends QueryTest
+class QueryTest extends \yiiunit\framework\db\QueryTest
 {
     public $driverName = 'pgsql';
 
diff --git a/tests/framework/db/pgsql/PostgreSQLSchemaTest.php b/tests/framework/db/pgsql/SchemaTest.php
similarity index 98%
rename from tests/framework/db/pgsql/PostgreSQLSchemaTest.php
rename to tests/framework/db/pgsql/SchemaTest.php
index c811847d20..73bd2ea610 100644
--- a/tests/framework/db/pgsql/PostgreSQLSchemaTest.php
+++ b/tests/framework/db/pgsql/SchemaTest.php
@@ -6,13 +6,12 @@ use yii\db\Expression;
 use yii\db\pgsql\Schema;
 use yiiunit\data\ar\ActiveRecord;
 use yiiunit\data\ar\Type;
-use yiiunit\framework\db\SchemaTest;
 
 /**
  * @group db
  * @group pgsql
  */
-class PostgreSQLSchemaTest extends SchemaTest
+class SchemaTest extends \yiiunit\framework\db\SchemaTest
 {
     public $driverName = 'pgsql';
 
diff --git a/tests/framework/db/sqlite/SqliteActiveDataProviderTest.php b/tests/framework/db/sqlite/ActiveDataProviderTest.php
similarity index 54%
rename from tests/framework/db/sqlite/SqliteActiveDataProviderTest.php
rename to tests/framework/db/sqlite/ActiveDataProviderTest.php
index 245bc88048..e1d7b69518 100644
--- a/tests/framework/db/sqlite/SqliteActiveDataProviderTest.php
+++ b/tests/framework/db/sqlite/ActiveDataProviderTest.php
@@ -1,14 +1,13 @@
 <?php
-namespace yiiunit\framework\db\sqlite;
 
-use yiiunit\framework\data\ActiveDataProviderTest;
+namespace yiiunit\framework\db\sqlite;
 
 /**
  * @group db
  * @group sqlite
  * @group data
  */
-class SqliteActiveDataProviderTest extends ActiveDataProviderTest
+class ActiveDataProviderTest extends \yiiunit\framework\data\ActiveDataProviderTest
 {
     public $driverName = 'sqlite';
 }
diff --git a/tests/framework/db/sqlite/SqliteActiveRecordTest.php b/tests/framework/db/sqlite/ActiveRecordTest.php
similarity index 56%
rename from tests/framework/db/sqlite/SqliteActiveRecordTest.php
rename to tests/framework/db/sqlite/ActiveRecordTest.php
index 28f0574f9a..e280919912 100644
--- a/tests/framework/db/sqlite/SqliteActiveRecordTest.php
+++ b/tests/framework/db/sqlite/ActiveRecordTest.php
@@ -1,13 +1,12 @@
 <?php
-namespace yiiunit\framework\db\sqlite;
 
-use yiiunit\framework\db\ActiveRecordTest;
+namespace yiiunit\framework\db\sqlite;
 
 /**
  * @group db
  * @group sqlite
  */
-class SqliteActiveRecordTest extends ActiveRecordTest
+class ActiveRecordTest extends \yiiunit\framework\db\ActiveRecordTest
 {
     protected $driverName = 'sqlite';
 }
diff --git a/tests/framework/db/sqlite/BatchQueryResultTest.php b/tests/framework/db/sqlite/BatchQueryResultTest.php
new file mode 100644
index 0000000000..dfd11e9bba
--- /dev/null
+++ b/tests/framework/db/sqlite/BatchQueryResultTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace yiiunit\framework\db\sqlite;
+
+/**
+ * @group db
+ * @group sqlite
+ */
+class BatchQueryResultTest extends \yiiunit\framework\db\BatchQueryResultTest
+{
+    public $driverName = 'sqlite';
+}
diff --git a/tests/framework/db/sqlite/ColumnSchemaBuilderTest.php b/tests/framework/db/sqlite/ColumnSchemaBuilderTest.php
index a9cf6d4bf0..e029f4ccf4 100644
--- a/tests/framework/db/sqlite/ColumnSchemaBuilderTest.php
+++ b/tests/framework/db/sqlite/ColumnSchemaBuilderTest.php
@@ -1,14 +1,16 @@
 <?php
+
 namespace yiiunit\framework\db\sqlite;
 
 use yii\db\sqlite\ColumnSchemaBuilder;
 use yii\db\Schema;
-use \yiiunit\framework\db\ColumnSchemaBuilderTest as BaseColumnSchemaBuilderTest;
 
 /**
  * ColumnSchemaBuilderTest tests ColumnSchemaBuilder for SQLite
+ * @group db
+ * @group sqlite
  */
-class ColumnSchemaBuilderTest extends BaseColumnSchemaBuilderTest
+class ColumnSchemaBuilderTest extends \yiiunit\framework\db\ColumnSchemaBuilderTest
 {
     /**
      * @param string $type
diff --git a/tests/framework/db/sqlite/SqliteCommandTest.php b/tests/framework/db/sqlite/CommandTest.php
similarity index 83%
rename from tests/framework/db/sqlite/SqliteCommandTest.php
rename to tests/framework/db/sqlite/CommandTest.php
index 4e5e2fa68c..8e94c14f21 100644
--- a/tests/framework/db/sqlite/SqliteCommandTest.php
+++ b/tests/framework/db/sqlite/CommandTest.php
@@ -1,13 +1,12 @@
 <?php
-namespace yiiunit\framework\db\sqlite;
 
-use yiiunit\framework\db\CommandTest;
+namespace yiiunit\framework\db\sqlite;
 
 /**
  * @group db
  * @group sqlite
  */
-class SqliteCommandTest extends CommandTest
+class CommandTest extends \yiiunit\framework\db\CommandTest
 {
     protected $driverName = 'sqlite';
 
diff --git a/tests/framework/db/sqlite/SqliteConnectionTest.php b/tests/framework/db/sqlite/ConnectionTest.php
similarity index 98%
rename from tests/framework/db/sqlite/SqliteConnectionTest.php
rename to tests/framework/db/sqlite/ConnectionTest.php
index e7868dfb69..21d4b95ff7 100644
--- a/tests/framework/db/sqlite/SqliteConnectionTest.php
+++ b/tests/framework/db/sqlite/ConnectionTest.php
@@ -1,9 +1,9 @@
 <?php
+
 namespace yiiunit\framework\db\sqlite;
 
 use yii\db\Connection;
 use yii\db\Transaction;
-use yiiunit\framework\db\ConnectionTest;
 use yiiunit\data\ar\ActiveRecord;
 use yiiunit\data\ar\Customer;
 
@@ -11,7 +11,7 @@ use yiiunit\data\ar\Customer;
  * @group db
  * @group sqlite
  */
-class SqliteConnectionTest extends ConnectionTest
+class ConnectionTest extends \yiiunit\framework\db\ConnectionTest
 {
     protected $driverName = 'sqlite';
 
diff --git a/tests/framework/db/sqlite/SqliteQueryBuilderTest.php b/tests/framework/db/sqlite/QueryBuilderTest.php
similarity index 97%
rename from tests/framework/db/sqlite/SqliteQueryBuilderTest.php
rename to tests/framework/db/sqlite/QueryBuilderTest.php
index c4834a1faa..ec1934a352 100644
--- a/tests/framework/db/sqlite/SqliteQueryBuilderTest.php
+++ b/tests/framework/db/sqlite/QueryBuilderTest.php
@@ -5,13 +5,12 @@ namespace yiiunit\framework\db\sqlite;
 use yii\db\Query;
 use yii\db\Schema;
 use yiiunit\data\base\TraversableObject;
-use yiiunit\framework\db\QueryBuilderTest;
 
 /**
  * @group db
  * @group sqlite
  */
-class SqliteQueryBuilderTest extends QueryBuilderTest
+class QueryBuilderTest extends \yiiunit\framework\db\QueryBuilderTest
 {
     protected $driverName = 'sqlite';
 
diff --git a/tests/framework/db/sqlite/SqliteQueryTest.php b/tests/framework/db/sqlite/QueryTest.php
similarity index 88%
rename from tests/framework/db/sqlite/SqliteQueryTest.php
rename to tests/framework/db/sqlite/QueryTest.php
index 82a074ada4..17baad43b5 100644
--- a/tests/framework/db/sqlite/SqliteQueryTest.php
+++ b/tests/framework/db/sqlite/QueryTest.php
@@ -2,13 +2,12 @@
 namespace yiiunit\framework\db\sqlite;
 
 use yii\db\Query;
-use yiiunit\framework\db\QueryTest;
 
 /**
  * @group db
  * @group sqlite
  */
-class SqliteQueryTest extends QueryTest
+class QueryTest extends \yiiunit\framework\db\QueryTest
 {
     protected $driverName = 'sqlite';
 
diff --git a/tests/framework/db/sqlite/SqliteSchemaTest.php b/tests/framework/db/sqlite/SchemaTest.php
similarity index 91%
rename from tests/framework/db/sqlite/SqliteSchemaTest.php
rename to tests/framework/db/sqlite/SchemaTest.php
index b66e5c3701..2761c4b421 100644
--- a/tests/framework/db/sqlite/SqliteSchemaTest.php
+++ b/tests/framework/db/sqlite/SchemaTest.php
@@ -1,13 +1,12 @@
 <?php
-namespace yiiunit\framework\db\sqlite;
 
-use yiiunit\framework\db\SchemaTest;
+namespace yiiunit\framework\db\sqlite;
 
 /**
  * @group db
  * @group sqlite
  */
-class SqliteSchemaTest extends SchemaTest
+class SchemaTest extends \yiiunit\framework\db\SchemaTest
 {
     protected $driverName = 'sqlite';