diff --git a/test/classes/dbi/DbiMysqlTest.php b/test/classes/Dbi/DbiMysqlTest.php
similarity index 98%
rename from test/classes/dbi/DbiMysqlTest.php
rename to test/classes/Dbi/DbiMysqlTest.php
index 53f6a9b529..63c68a013c 100644
--- a/test/classes/dbi/DbiMysqlTest.php
+++ b/test/classes/Dbi/DbiMysqlTest.php
@@ -4,22 +4,16 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
+namespace PhpMyAdmin\Tests\Dbi;
 
 use PhpMyAdmin\Dbi\DbiMysql;
 
-require_once 'test/PMATestCase.php';
-
-
 /**
  * Tests for PhpMyAdmin\Dbi\DbiMysql class
  *
  * @package PhpMyAdmin-test
  */
-class DbiMysqlTest extends PMATestCase
+class DbiMysqlTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/dbi/DbiMysqliTest.php b/test/classes/Dbi/DbiMysqliTest.php
similarity index 98%
rename from test/classes/dbi/DbiMysqliTest.php
rename to test/classes/Dbi/DbiMysqliTest.php
index 2045ba808b..115217b79a 100644
--- a/test/classes/dbi/DbiMysqliTest.php
+++ b/test/classes/Dbi/DbiMysqliTest.php
@@ -4,21 +4,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Dbi;
 
-/*
- * Include to test.
- */
 use PhpMyAdmin\Dbi\DbiMysqli;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Dbi\DbiMysqli class
  *
  * @package PhpMyAdmin-test
  */
-class DbiMysqliTest extends PMATestCase
+class DbiMysqliTest extends \PMATestCase
 {
     /**
      * @access protected