diff --git a/composer.json b/composer.json
index c8db71e803..6572b3c6ae 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,8 @@
     "autoload-dev": {
         "psr-4": {
             "PhpMyAdmin\\Tests\\": "test/classes"
-        }
+        },
+        "classmap": ["test/PMATestCase.php"]
     },
     "repositories": [
         {
diff --git a/test/classes/AdvisorTest.php b/test/classes/AdvisorTest.php
index 2c35421034..f1e5e57af8 100644
--- a/test/classes/AdvisorTest.php
+++ b/test/classes/AdvisorTest.php
@@ -5,13 +5,10 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
-require_once 'test/PMATestCase.php';
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Advisor;
+use PhpMyAdmin\Config;
 use PhpMyAdmin\Theme;
 
 /**
@@ -19,7 +16,7 @@ use PhpMyAdmin\Theme;
  *
  * @package PhpMyAdmin-test
  */
-class AdvisorTest extends PMATestCase
+class AdvisorTest extends \PMATestCase
 {
 
     /**
@@ -30,6 +27,7 @@ class AdvisorTest extends PMATestCase
      */
     public function setup()
     {
+        $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['server'] = 1;
     }
 
diff --git a/test/classes/BookmarkTest.php b/test/classes/BookmarkTest.php
index 8eece388ed..17b8e336c0 100644
--- a/test/classes/BookmarkTest.php
+++ b/test/classes/BookmarkTest.php
@@ -5,15 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
-use PhpMyAdmin\Bookmark;
+namespace PhpMyAdmin\Tests;
 
+use PhpMyAdmin\Bookmark;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * Tests for Bookmark class
  *
  * @package PhpMyAdmin-test
  */
-class BookmarkTest extends PHPUnit_Framework_TestCase
+class BookmarkTest extends TestCase
 {
     /**
      * Sets up the fixture, for example, opens a network connection.
diff --git a/test/classes/BrowseForeignersTest.php b/test/classes/BrowseForeignersTest.php
index 999adada4e..e62c2dd2fa 100644
--- a/test/classes/BrowseForeignersTest.php
+++ b/test/classes/BrowseForeignersTest.php
@@ -8,13 +8,14 @@
 namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\BrowseForeigners;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * Tests for PhpMyAdmin\BrowseForeigners
  *
  * @package PhpMyAdmin-test
  */
-class BrowseForeignersTest extends \PHPUnit_Framework_TestCase
+class BrowseForeignersTest extends TestCase
 {
     /**
      * Setup for test cases
diff --git a/test/classes/CentralColumnsTest.php b/test/classes/CentralColumnsTest.php
index 7b4c740e91..47395ac283 100644
--- a/test/classes/CentralColumnsTest.php
+++ b/test/classes/CentralColumnsTest.php
@@ -8,20 +8,21 @@
 namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\CentralColumns;
+use PhpMyAdmin\Config;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\TypesMySQL;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
+use PHPUnit_Framework_TestCase as TestCase;
 
 $GLOBALS['server'] = 1;
 
-
 /**
  * tests for PhpMyAdmin\CentralColumns
  *
  * @package PhpMyAdmin-test
  */
-class CentralColumnsTest extends \PHPUnit_Framework_TestCase
+class CentralColumnsTest extends TestCase
 {
     private $_columnData = array(
         array(
@@ -67,6 +68,7 @@ class CentralColumnsTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
+        $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['PMA_Types'] = new TypesMySQL();
         $GLOBALS['cfg']['Server']['user'] = 'pma_user';
         $GLOBALS['cfg']['Server']['DisableIS'] = true;
diff --git a/test/classes/CharsetsTest.php b/test/classes/CharsetsTest.php
index ea0036dfca..1d9bf56ef3 100644
--- a/test/classes/CharsetsTest.php
+++ b/test/classes/CharsetsTest.php
@@ -5,15 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Charsets;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * Tests for MySQL Charsets
  *
  * @package PhpMyAdmin-test
  */
-class CharsetsTest extends PHPUnit_Framework_TestCase
+class CharsetsTest extends TestCase
 {
     public function setUp()
     {
diff --git a/test/classes/CheckUserPrivilegesTest.php b/test/classes/CheckUserPrivilegesTest.php
index d7bc41cbfb..00e98af5fe 100644
--- a/test/classes/CheckUserPrivilegesTest.php
+++ b/test/classes/CheckUserPrivilegesTest.php
@@ -8,6 +8,7 @@
 namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\CheckUserPrivileges;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /*
  * Include to test.
@@ -20,7 +21,7 @@ $GLOBALS['cfg']['Server']['DisableIS'] = false;
  *
  * @package PhpMyAdmin-test
  */
-class CheckUserPrivilegesTest extends \PHPUnit_Framework_TestCase
+class CheckUserPrivilegesTest extends TestCase
 {
     /**
      * prepares environment for tests
diff --git a/test/classes/config/ConfigFileTest.php b/test/classes/Config/ConfigFileTest.php
similarity index 99%
rename from test/classes/config/ConfigFileTest.php
rename to test/classes/Config/ConfigFileTest.php
index f86c3e6f64..1c161e7df7 100644
--- a/test/classes/config/ConfigFileTest.php
+++ b/test/classes/Config/ConfigFileTest.php
@@ -5,20 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Config;
 
-/*
- * Include to test.
- */
 use PhpMyAdmin\Config\ConfigFile;
-
-require_once 'test/PMATestCase.php';
+use stdClass;
 
 /**
  * Tests for Config File Management
  *
  * @package PhpMyAdmin-test
  */
-class ConfigFileTest extends PMATestCase
+class ConfigFileTest extends \PMATestCase
 {
     /**
      * Any valid key that exists in config.default.php and isn't empty
diff --git a/test/classes/config/DescriptionTest.php b/test/classes/Config/DescriptionTest.php
similarity index 90%
rename from test/classes/config/DescriptionTest.php
rename to test/classes/Config/DescriptionTest.php
index 16252e0c9f..9c2d660c84 100644
--- a/test/classes/config/DescriptionTest.php
+++ b/test/classes/Config/DescriptionTest.php
@@ -5,18 +5,28 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Config;
 
+use PhpMyAdmin\Config;
 use PhpMyAdmin\Config\Descriptions;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PMA_FormDisplay class
  *
  * @package PhpMyAdmin-test
  */
-class DescriptionTest extends PMATestCase
+class DescriptionTest extends \PMATestCase
 {
+    /**
+     * Setup tests
+     *
+     * @return void
+     */
+    public function setUp()
+    {
+        $GLOBALS['PMA_Config'] = new Config();
+    }
+
     /**
      * @dataProvider getValues
      */
diff --git a/test/classes/config/FormDisplayTemplateTest.php b/test/classes/Config/FormDisplayTemplateTest.php
similarity index 98%
rename from test/classes/config/FormDisplayTemplateTest.php
rename to test/classes/Config/FormDisplayTemplateTest.php
index 6129298d69..d8428b09ec 100644
--- a/test/classes/config/FormDisplayTemplateTest.php
+++ b/test/classes/Config/FormDisplayTemplateTest.php
@@ -5,7 +5,9 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Config;
 
+use PhpMyAdmin\Config;
 use PhpMyAdmin\Config\FormDisplayTemplate;
 use PhpMyAdmin\Theme;
 use PHPUnit_Framework_TestCase as TestCase;
@@ -17,6 +19,16 @@ use PHPUnit_Framework_TestCase as TestCase;
  */
 class FormDisplayTemplateTest extends TestCase
 {
+    /**
+     * Setup tests
+     *
+     * @return void
+     */
+    public function setUp()
+    {
+        $GLOBALS['PMA_Config'] = new Config();
+    }
+
     /**
      * Test for FormDisplayTemplate::displayFormTop()
      *
diff --git a/test/classes/config/FormDisplayTest.php b/test/classes/Config/FormDisplayTest.php
similarity index 93%
rename from test/classes/config/FormDisplayTest.php
rename to test/classes/Config/FormDisplayTest.php
index 05036722c3..259eb70858 100644
--- a/test/classes/config/FormDisplayTest.php
+++ b/test/classes/Config/FormDisplayTest.php
@@ -5,19 +5,21 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Config;
 
 use PhpMyAdmin\Config;
 use PhpMyAdmin\Config\ConfigFile;
 use PhpMyAdmin\Config\FormDisplay;
-
-require_once 'test/PMATestCase.php';
+use ReflectionClass;
+use ReflectionMethod;
+use ReflectionProperty;
 
 /**
  * Tests for PMA_FormDisplay class
  *
  * @package PhpMyAdmin-test
  */
-class FormDisplayTest extends PMATestCase
+class FormDisplayTest extends \PMATestCase
 {
     /**
      * @var FormDisplay
@@ -33,7 +35,6 @@ class FormDisplayTest extends PMATestCase
     {
         $GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
         $GLOBALS['PMA_Config'] = new Config();
-        $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['server'] = 0;
         $this->object = new FormDisplay(new ConfigFile());
     }
@@ -70,7 +71,7 @@ class FormDisplayTest extends PMATestCase
      */
     public function testRegisterForm()
     {
-        $reflection = new \ReflectionClass('PhpMyAdmin\Config\FormDisplay');
+        $reflection = new ReflectionClass('PhpMyAdmin\Config\FormDisplay');
 
         $attrForms = $reflection->getProperty('_forms');
         $attrForms->setAccessible(true);
@@ -125,7 +126,7 @@ class FormDisplayTest extends PMATestCase
             ->setMethods(array('save'))
             ->getMock();
 
-        $attrForms = new \ReflectionProperty('PhpMyAdmin\Config\FormDisplay', '_forms');
+        $attrForms = new ReflectionProperty('PhpMyAdmin\Config\FormDisplay', '_forms');
         $attrForms->setAccessible(true);
         $attrForms->setValue($this->object, array(1, 2, 3));
 
@@ -152,7 +153,7 @@ class FormDisplayTest extends PMATestCase
      */
     public function testDisplayErrors()
     {
-        $reflection = new \ReflectionClass('PhpMyAdmin\Config\FormDisplay');
+        $reflection = new ReflectionClass('PhpMyAdmin\Config\FormDisplay');
 
         $attrIsValidated = $reflection->getProperty('_isValidated');
         $attrIsValidated->setAccessible(true);
@@ -198,7 +199,7 @@ class FormDisplayTest extends PMATestCase
      */
     public function testFixErrors()
     {
-        $reflection = new \ReflectionClass('PhpMyAdmin\Config\FormDisplay');
+        $reflection = new ReflectionClass('PhpMyAdmin\Config\FormDisplay');
 
         $attrIsValidated = $reflection->getProperty('_isValidated');
         $attrIsValidated->setAccessible(true);
@@ -249,7 +250,7 @@ class FormDisplayTest extends PMATestCase
      */
     public function testValidateSelect()
     {
-        $attrValidateSelect = new \ReflectionMethod(
+        $attrValidateSelect = new ReflectionMethod(
             'PhpMyAdmin\Config\FormDisplay',
             '_validateSelect'
         );
@@ -303,7 +304,7 @@ class FormDisplayTest extends PMATestCase
      */
     public function testHasErrors()
     {
-        $attrErrors = new \ReflectionProperty('PhpMyAdmin\Config\FormDisplay', '_errors');
+        $attrErrors = new ReflectionProperty('PhpMyAdmin\Config\FormDisplay', '_errors');
         $attrErrors->setAccessible(true);
 
         $this->assertFalse(
@@ -351,7 +352,7 @@ class FormDisplayTest extends PMATestCase
      */
     public function testGetOptName()
     {
-        $method = new \ReflectionMethod('PhpMyAdmin\Config\FormDisplay', '_getOptName');
+        $method = new ReflectionMethod('PhpMyAdmin\Config\FormDisplay', '_getOptName');
         $method->setAccessible(true);
 
         $this->assertEquals(
@@ -372,10 +373,10 @@ class FormDisplayTest extends PMATestCase
      */
     public function testLoadUserprefsInfo()
     {
-        $method = new \ReflectionMethod('PhpMyAdmin\Config\FormDisplay', '_loadUserprefsInfo');
+        $method = new ReflectionMethod('PhpMyAdmin\Config\FormDisplay', '_loadUserprefsInfo');
         $method->setAccessible(true);
 
-        $attrUserprefs = new \ReflectionProperty(
+        $attrUserprefs = new ReflectionProperty(
             'PhpMyAdmin\Config\FormDisplay',
             '_userprefsDisallow'
         );
@@ -395,7 +396,7 @@ class FormDisplayTest extends PMATestCase
      */
     public function testSetComments()
     {
-        $method = new \ReflectionMethod('PhpMyAdmin\Config\FormDisplay', '_setComments');
+        $method = new ReflectionMethod('PhpMyAdmin\Config\FormDisplay', '_setComments');
         $method->setAccessible(true);
 
         // recoding
diff --git a/test/classes/config/FormTest.php b/test/classes/Config/FormTest.php
similarity index 93%
rename from test/classes/config/FormTest.php
rename to test/classes/Config/FormTest.php
index 06635c5943..273abffbe7 100644
--- a/test/classes/config/FormTest.php
+++ b/test/classes/Config/FormTest.php
@@ -5,20 +5,21 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Config;
 
 use PhpMyAdmin\Config;
 use PhpMyAdmin\Config\ConfigFile;
 use PhpMyAdmin\Config\Form;
 use PhpMyAdmin\Theme;
-
-require_once 'test/PMATestCase.php';
+use ReflectionClass;
+use ReflectionProperty;
 
 /**
  * Tests for PMA_Form class
  *
  * @package PhpMyAdmin-test
  */
-class FormTest extends PMATestCase
+class FormTest extends \PMATestCase
 {
     /**
      * @var Form
@@ -34,7 +35,6 @@ class FormTest extends PMATestCase
     {
         $GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
         $GLOBALS['PMA_Config'] = new Config();
-        $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['server'] = 0;
         $this->object = new Form(
             'pma_form_name', array('pma_form1','pma_form2'), new ConfigFile(), 1
@@ -80,7 +80,7 @@ class FormTest extends PMATestCase
      */
     public function testGetOptionType()
     {
-        $attrFieldsTypes = new \ReflectionProperty('PhpMyAdmin\Config\Form', '_fieldsTypes');
+        $attrFieldsTypes = new ReflectionProperty('PhpMyAdmin\Config\Form', '_fieldsTypes');
         $attrFieldsTypes->setAccessible(true);
         $attrFieldsTypes->setValue(
             $this->object,
@@ -136,7 +136,7 @@ class FormTest extends PMATestCase
      */
     public function testReadFormPathsCallBack()
     {
-        $reflection = new \ReflectionClass('PhpMyAdmin\Config\Form');
+        $reflection = new ReflectionClass('PhpMyAdmin\Config\Form');
         $method = $reflection->getMethod('_readFormPathsCallback');
         $method->setAccessible(true);
 
@@ -188,7 +188,7 @@ class FormTest extends PMATestCase
      */
     public function testReadFormPaths()
     {
-        $reflection = new \ReflectionClass('PhpMyAdmin\Config\Form');
+        $reflection = new ReflectionClass('PhpMyAdmin\Config\Form');
         $method = $reflection->getMethod('readFormPaths');
         $method->setAccessible(true);
 
@@ -243,7 +243,7 @@ class FormTest extends PMATestCase
      */
     public function testReadTypes()
     {
-        $reflection = new \ReflectionClass('PhpMyAdmin\Config\Form');
+        $reflection = new ReflectionClass('PhpMyAdmin\Config\Form');
         $method = $reflection->getMethod('readTypes');
         $method->setAccessible(true);
 
diff --git a/test/classes/config/FormListTest.php b/test/classes/Config/Forms/FormListTest.php
similarity index 93%
rename from test/classes/config/FormListTest.php
rename to test/classes/Config/Forms/FormListTest.php
index 11a82d4321..ab0e02e467 100644
--- a/test/classes/config/FormListTest.php
+++ b/test/classes/Config/Forms/FormListTest.php
@@ -5,23 +5,24 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Config\Forms;
 
+use PhpMyAdmin\Config;
 use PhpMyAdmin\Config\ConfigFile;
 use PhpMyAdmin\Config\Forms\User\UserFormList;
 use PhpMyAdmin\Config\Forms\Page\PageFormList;
 use PhpMyAdmin\Config\Forms\Setup\SetupFormList;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PMA_FormDisplay class
  *
  * @package PhpMyAdmin-test
  */
-class FormListTest extends PMATestCase
+class FormListTest extends \PMATestCase
 {
     public function setUp()
     {
+        $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['server'] = 1;
     }
 
diff --git a/test/classes/config/PageSettingsTest.php b/test/classes/Config/PageSettingsTest.php
similarity index 93%
rename from test/classes/config/PageSettingsTest.php
rename to test/classes/Config/PageSettingsTest.php
index ba7367e72d..dc7526240a 100644
--- a/test/classes/config/PageSettingsTest.php
+++ b/test/classes/Config/PageSettingsTest.php
@@ -5,16 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
-use PhpMyAdmin\Config\PageSettings;
+namespace PhpMyAdmin\Tests\Config;
 
-require_once 'test/PMATestCase.php';
+use PhpMyAdmin\Config;
+use PhpMyAdmin\Config\PageSettings;
 
 /**
  * Tests for PhpMyAdmin\Config\PageSettings
  *
  * @package PhpMyAdmin-test
  */
-class PageSettingsTest extends PMATestCase
+class PageSettingsTest extends \PMATestCase
 {
     /**
      * Setup tests
@@ -23,6 +24,7 @@ class PageSettingsTest extends PMATestCase
      */
     public function setUp()
     {
+        $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['server'] = 1;
         $GLOBALS['db'] = 'db';
     }
diff --git a/test/classes/config/ServerConfigChecksTest.php b/test/classes/Config/ServerConfigChecksTest.php
similarity index 94%
rename from test/classes/config/ServerConfigChecksTest.php
rename to test/classes/Config/ServerConfigChecksTest.php
index 7441c6a9dd..3599418189 100644
--- a/test/classes/config/ServerConfigChecksTest.php
+++ b/test/classes/Config/ServerConfigChecksTest.php
@@ -5,23 +5,25 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Config;
 
+use PhpMyAdmin\Config;
 use PhpMyAdmin\Config\ConfigFile;
 use PhpMyAdmin\Config\ServerConfigChecks;
-
-require_once 'test/PMATestCase.php';
+use ReflectionProperty;
 
 /**
  * Tests for ServeConfigChecks class
  *
  * @package PhpMyAdmin-test
  */
-class ServeConfigChecksTest extends PMATestCase
+class ServeConfigChecksTest extends \PMATestCase
 {
     private $sessionID;
 
     public function setUp()
     {
+        $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['cfg']['AvailableCharsets'] = array();
         $GLOBALS['cfg']['ServerDefault'] = 0;
         $GLOBALS['server'] = 0;
@@ -29,7 +31,7 @@ class ServeConfigChecksTest extends PMATestCase
         $cf = new ConfigFile();
         $GLOBALS['ConfigFile'] = $cf;
 
-        $reflection = new \ReflectionProperty('PhpMyAdmin\Config\ConfigFile', '_id');
+        $reflection = new ReflectionProperty('PhpMyAdmin\Config\ConfigFile', '_id');
         $reflection->setAccessible(true);
         $this->sessionID = $reflection->getValue($cf);
 
diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php
index b77f117c7e..02ebc94189 100644
--- a/test/classes/ConfigTest.php
+++ b/test/classes/ConfigTest.php
@@ -6,20 +6,18 @@
  * @package PhpMyAdmin-test
  * @group current
  */
+namespace PhpMyAdmin\Tests;
 
-/*
- * Include to test.
- */
+use PhpMyAdmin\Config;
 use PhpMyAdmin\Theme;
-
-require_once 'test/PMATestCase.php';
+use PHPUnit_Framework_Assert as Assert;
 
 /**
  * Tests behaviour of PhpMyAdmin\Config class
  *
  * @package PhpMyAdmin-test
  */
-class ConfigTest extends PMATestCase
+class ConfigTest extends \PMATestCase
 {
     /**
      * Turn off backup globals
@@ -44,14 +42,14 @@ class ConfigTest extends PMATestCase
      */
     protected function setUp()
     {
-        $this->object = new PhpMyAdmin\Config;
+        $this->object = new Config;
         $GLOBALS['server'] = 0;
         $_SESSION['is_git_revision'] = true;
-        $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config(CONFIG_FILE);
+        $GLOBALS['PMA_Config'] = new Config(CONFIG_FILE);
         $GLOBALS['cfg']['ProxyUrl'] = '';
 
         //for testing file permissions
-        $this->permTestObj = new PhpMyAdmin\Config("./config.sample.inc.php");
+        $this->permTestObj = new Config("./config.sample.inc.php");
     }
 
     /**
@@ -90,12 +88,12 @@ class ConfigTest extends PMATestCase
     {
         $this->assertContains(
             '<form name="form_fontsize_selection" id="form_fontsize_selection"',
-            PhpMyAdmin\Config::getFontsizeForm()
+            Config::getFontsizeForm()
         );
 
         $this->assertContains(
             '<label for="select_fontsize">',
-            PhpMyAdmin\Config::getFontsizeForm()
+            Config::getFontsizeForm()
         );
 
         //test getFontsizeOptions for "em" unit
@@ -104,44 +102,44 @@ class ConfigTest extends PMATestCase
         $_COOKIE['pma_fontsize'] = "10em";
         $this->assertContains(
             '<option value="7em"',
-            PhpMyAdmin\Config::getFontsizeForm()
+            Config::getFontsizeForm()
         );
         $this->assertContains(
             '<option value="8em"',
-            PhpMyAdmin\Config::getFontsizeForm()
+            Config::getFontsizeForm()
         );
 
         //test getFontsizeOptions for "pt" unit
         $_COOKIE['pma_fontsize'] = "10pt";
         $this->assertContains(
             '<option value="2pt"',
-            PhpMyAdmin\Config::getFontsizeForm()
+            Config::getFontsizeForm()
         );
         $this->assertContains(
             '<option value="4pt"',
-            PhpMyAdmin\Config::getFontsizeForm()
+            Config::getFontsizeForm()
         );
 
         //test getFontsizeOptions for "px" unit
         $_COOKIE['pma_fontsize'] = "10px";
         $this->assertContains(
             '<option value="5px"',
-            PhpMyAdmin\Config::getFontsizeForm()
+            Config::getFontsizeForm()
         );
         $this->assertContains(
             '<option value="6px"',
-            PhpMyAdmin\Config::getFontsizeForm()
+            Config::getFontsizeForm()
         );
 
         //test getFontsizeOptions for unknown unit
         $_COOKIE['pma_fontsize'] = "10abc";
         $this->assertContains(
             '<option value="7abc"',
-            PhpMyAdmin\Config::getFontsizeForm()
+            Config::getFontsizeForm()
         );
         $this->assertContains(
             '<option value="8abc"',
-            PhpMyAdmin\Config::getFontsizeForm()
+            Config::getFontsizeForm()
         );
         unset($_COOKIE['pma_fontsize']);
         //rollback the fontsize setting
@@ -830,10 +828,9 @@ class ConfigTest extends PMATestCase
      */
     public function testGetThemeUniqueValue()
     {
-
         $partial_sum = (
-            PHPUnit_Framework_Assert::readAttribute($this->object, 'source_mtime') +
-            PHPUnit_Framework_Assert::readAttribute(
+            Assert::readAttribute($this->object, 'source_mtime') +
+            Assert::readAttribute(
                 $this->object,
                 'default_source_mtime'
             ) +
diff --git a/test/classes/controllers/DatabaseStructureControllerTest.php b/test/classes/Controllers/Database/DatabaseStructureControllerTest.php
similarity index 98%
rename from test/classes/controllers/DatabaseStructureControllerTest.php
rename to test/classes/Controllers/Database/DatabaseStructureControllerTest.php
index d68aff0a01..901174acd6 100644
--- a/test/classes/controllers/DatabaseStructureControllerTest.php
+++ b/test/classes/Controllers/Database/DatabaseStructureControllerTest.php
@@ -1,32 +1,29 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * DatabaseStructureController_Test class
+ * DatabaseStructureControllerTest class
  *
  * this class is for testing DatabaseStructureController class
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Controllers\Database;
 
-/*
- * Include to test.
- */
 use PhpMyAdmin\Controllers\Database\DatabaseStructureController;
 use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Table;
 use PhpMyAdmin\Tests\Stubs\Response as ResponseStub;
 use PhpMyAdmin\Theme;
-
-require_once 'test/PMATestCase.php';
+use ReflectionClass;
 
 /**
- * DatabaseStructureController_Test class
+ * DatabaseStructureControllerTest class
  *
  * this class is for testing DatabaseStructureController class
  *
  * @package PhpMyAdmin-test
  */
-class DatabaseStructureControllerTest extends PMATestCase
+class DatabaseStructureControllerTest extends \PMATestCase
 {
     /**
      * @var \PhpMyAdmin\Tests\Stubs\Response
diff --git a/test/classes/controllers/ServerBinlogControllerTest.php b/test/classes/Controllers/Server/ServerBinlogControllerTest.php
similarity index 98%
rename from test/classes/controllers/ServerBinlogControllerTest.php
rename to test/classes/Controllers/Server/ServerBinlogControllerTest.php
index 0b608e31e4..5b2911cc1f 100644
--- a/test/classes/controllers/ServerBinlogControllerTest.php
+++ b/test/classes/Controllers/Server/ServerBinlogControllerTest.php
@@ -5,20 +5,20 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Controllers\Server;
 
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Controllers\Server\ServerBinlogController;
 use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Util;
-
-require_once 'test/PMATestCase.php';
+use ReflectionClass;
 
 /**
  * Tests for ServerCollationsController class
  *
  * @package PhpMyAdmin-test
  */
-class ServerBinlogControllerTest extends PMATestCase
+class ServerBinlogControllerTest extends \PMATestCase
 {
     /**
      * Prepares environment for the test.
diff --git a/test/classes/controllers/ServerCollationsControllerTest.php b/test/classes/Controllers/Server/ServerCollationsControllerTest.php
similarity index 96%
rename from test/classes/controllers/ServerCollationsControllerTest.php
rename to test/classes/Controllers/Server/ServerCollationsControllerTest.php
index 6a826064a1..faa438f4cc 100644
--- a/test/classes/controllers/ServerCollationsControllerTest.php
+++ b/test/classes/Controllers/Server/ServerCollationsControllerTest.php
@@ -5,10 +5,12 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Controllers\Server;
 
 use PhpMyAdmin\Controllers\Server\ServerCollationsController;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Theme;
+use ReflectionClass;
 
 /*
  * Include to test.
@@ -24,19 +26,15 @@ $GLOBALS['text_dir'] = "text_dir";
 $GLOBALS['cfg']['Server'] = array(
     'DisableIS' => false
 );
-//$_SESSION
-
-
 
 require_once 'libraries/server_common.inc.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * Tests for ServerCollationsController class
  *
  * @package PhpMyAdmin-test
  */
-class ServerCollationsControllerTest extends PMATestCase
+class ServerCollationsControllerTest extends \PMATestCase
 {
     /**
      * Prepares environment for the test.
diff --git a/test/classes/controllers/ServerDatabasesControllerTest.php b/test/classes/Controllers/Server/ServerDatabasesControllerTest.php
similarity index 98%
rename from test/classes/controllers/ServerDatabasesControllerTest.php
rename to test/classes/Controllers/Server/ServerDatabasesControllerTest.php
index 24351ef369..3f502c181e 100644
--- a/test/classes/controllers/ServerDatabasesControllerTest.php
+++ b/test/classes/Controllers/Server/ServerDatabasesControllerTest.php
@@ -5,13 +5,14 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Controllers\Server;
 
 use PhpMyAdmin\Charsets;
+use PhpMyAdmin\Config;
 use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Tests\Stubs\Response as ResponseStub;
 use PhpMyAdmin\Theme;
-
-require_once 'test/PMATestCase.php';
+use ReflectionClass;
 
 /**
  * Tests for ServerDatabasesController class
@@ -19,7 +20,7 @@ require_once 'test/PMATestCase.php';
  * @package PhpMyAdmin-test
  */
 
-class ServerDatabasesControllerTest extends PMATestCase
+class ServerDatabasesControllerTest extends \PMATestCase
 {
     /**
      * Prepares environment for the test.
@@ -33,7 +34,7 @@ class ServerDatabasesControllerTest extends PMATestCase
         $_REQUEST['pos'] = 3;
 
         //$GLOBALS
-        $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config();
+        $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['is_superuser'] = true;
 
diff --git a/test/classes/controllers/ServerEnginesControllerTest.php b/test/classes/Controllers/Server/ServerEnginesControllerTest.php
similarity index 94%
rename from test/classes/controllers/ServerEnginesControllerTest.php
rename to test/classes/Controllers/Server/ServerEnginesControllerTest.php
index 14cd674b61..9cfaac48f0 100644
--- a/test/classes/controllers/ServerEnginesControllerTest.php
+++ b/test/classes/Controllers/Server/ServerEnginesControllerTest.php
@@ -5,21 +5,21 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Controllers\Server;
 
+use PhpMyAdmin\Controllers\Server\ServerEnginesController;
 use PhpMyAdmin\StorageEngine;
 use PhpMyAdmin\Theme;
-use PhpMyAdmin\Controllers\Server\ServerEnginesController;
 use PhpMyAdmin\Url;
-
-
-require_once 'test/PMATestCase.php';
+use PhpMyAdmin\Util;
+use ReflectionClass;
 
 /**
  * Tests for ServerEnginesController class
  *
  * @package PhpMyAdmin-test
  */
-class ServerEnginesControllerTest extends PMATestCase
+class ServerEnginesControllerTest extends \PMATestCase
 {
     /**
      * Prepares environment for the test.
@@ -123,7 +123,7 @@ class ServerEnginesControllerTest extends PMATestCase
 
         //validate 2: Engine Mysql Help Page
         $this->assertContains(
-            PhpMyAdmin\Util::showMySQLDocu($engine_plugin->getMysqlHelpPage()),
+            Util::showMySQLDocu($engine_plugin->getMysqlHelpPage()),
             $html
         );
 
diff --git a/test/classes/controllers/ServerPluginsControllerTest.php b/test/classes/Controllers/Server/ServerPluginsControllerTest.php
similarity index 96%
rename from test/classes/controllers/ServerPluginsControllerTest.php
rename to test/classes/Controllers/Server/ServerPluginsControllerTest.php
index c4b0c29928..80d0dbfb86 100644
--- a/test/classes/controllers/ServerPluginsControllerTest.php
+++ b/test/classes/Controllers/Server/ServerPluginsControllerTest.php
@@ -5,22 +5,19 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Controllers\Server;
 
-/*
- * Include to test.
- */
-use PhpMyAdmin\Theme;
 use PhpMyAdmin\Controllers\Server\ServerPluginsController;
 use PhpMyAdmin\Di\Container;
-
-require_once 'test/PMATestCase.php';
+use PhpMyAdmin\Theme;
+use ReflectionClass;
 
 /**
  * Tests for ServerPluginsController class
  *
  * @package PhpMyAdmin-test
  */
-class ServerPluginsControllerTest extends PMATestCase
+class ServerPluginsControllerTest extends \PMATestCase
 {
     /**
      * Prepares environment for the test.
diff --git a/test/classes/controllers/ServerVariablesControllerTest.php b/test/classes/Controllers/Server/ServerVariablesControllerTest.php
similarity index 97%
rename from test/classes/controllers/ServerVariablesControllerTest.php
rename to test/classes/Controllers/Server/ServerVariablesControllerTest.php
index 25f416c56e..717c41b267 100644
--- a/test/classes/controllers/ServerVariablesControllerTest.php
+++ b/test/classes/Controllers/Server/ServerVariablesControllerTest.php
@@ -5,21 +5,22 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Controllers\Server;
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Tests\Stubs\Response as ResponseStub;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Url;
-
-require_once 'test/PMATestCase.php';
+use PhpMyAdmin\Util;
+use ReflectionClass;
 
 /**
  * Tests for ServerVariablesController class
  *
  * @package PhpMyAdmin-test
  */
-class ServerVariablesControllerTest extends PMATestCase
+class ServerVariablesControllerTest extends \PMATestCase
 {
     /**
      * @var \PhpMyAdmin\Tests\Stubs\Response
@@ -184,11 +185,11 @@ class ServerVariablesControllerTest extends PMATestCase
         );
         //validate 2: images
         $this->assertContains(
-            PhpMyAdmin\Util::getIcon('b_save.png', __('Save')),
+            Util::getIcon('b_save.png', __('Save')),
             $html
         );
         $this->assertContains(
-            PhpMyAdmin\Util::getIcon('b_close.png', __('Cancel')),
+            Util::getIcon('b_close.png', __('Cancel')),
             $html
         );
     }
diff --git a/test/classes/controllers/TableIndexesControllerTest.php b/test/classes/Controllers/Table/TableIndexesControllerTest.php
similarity index 94%
rename from test/classes/controllers/TableIndexesControllerTest.php
rename to test/classes/Controllers/Table/TableIndexesControllerTest.php
index 90a9aae9d4..2a92e6c3fe 100644
--- a/test/classes/controllers/TableIndexesControllerTest.php
+++ b/test/classes/Controllers/Table/TableIndexesControllerTest.php
@@ -5,25 +5,24 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Controllers\Table;
 
 use PhpMyAdmin\Controllers\Table\TableIndexesController;
 use PhpMyAdmin\Di\Container;
+use PhpMyAdmin\Index;
+use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Tests\Stubs\Response as ResponseStub;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Url;
-
-/*
- * Include to test.
- */
-require_once 'test/PMATestCase.php';
+use PhpMyAdmin\Util;
 
 /**
  * Tests for libraries/controllers/TableIndexesController.php
  *
  * @package PhpMyAdmin-test
  */
-class TableIndexesControllerTest extends PMATestCase
+class TableIndexesControllerTest extends \PMATestCase
 {
     /**
      * Setup function for test cases
@@ -152,7 +151,7 @@ class TableIndexesControllerTest extends PMATestCase
         $response = new ResponseStub();
         $container->set('PhpMyAdmin\Response', $response);
         $container->alias('response', 'PhpMyAdmin\Response');
-        $index = new PhpMyAdmin\Index();
+        $index = new Index();
 
         $ctrl = new TableIndexesController($index);
 
@@ -173,8 +172,8 @@ class TableIndexesControllerTest extends PMATestCase
             $html
         );
 
-        $doc_html = PhpMyAdmin\Util::showHint(
-            PhpMyAdmin\Message::notice(
+        $doc_html = Util::showHint(
+            Message::notice(
                 __(
                     '"PRIMARY" <b>must</b> be the name of'
                     . ' and <b>only of</b> a primary key!'
@@ -187,7 +186,7 @@ class TableIndexesControllerTest extends PMATestCase
         );
 
         $this->assertContains(
-            PhpMyAdmin\Util::showMySQLDocu('ALTER_TABLE'),
+            Util::showMySQLDocu('ALTER_TABLE'),
             $html
         );
 
diff --git a/test/classes/controllers/TableRelationControllerTest.php b/test/classes/Controllers/Table/TableRelationControllerTest.php
similarity index 98%
rename from test/classes/controllers/TableRelationControllerTest.php
rename to test/classes/Controllers/Table/TableRelationControllerTest.php
index 0720c11417..e6e3eed847 100644
--- a/test/classes/controllers/TableRelationControllerTest.php
+++ b/test/classes/Controllers/Table/TableRelationControllerTest.php
@@ -5,22 +5,18 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Controllers\Table;
 
-/*
- * Include to test.
- */
 use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Tests\Stubs\Response as ResponseStub;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for libraries/controllers/TableRelationController.php
  *
  * @package PhpMyAdmin-test
  */
-class TableRelationControllerTest extends PMATestCase
+class TableRelationControllerTest extends \PMATestCase
 {
     /**
      * @var \PhpMyAdmin\Tests\Stubs\Response
diff --git a/test/classes/controllers/TableSearchControllerTest.php b/test/classes/Controllers/Table/TableSearchControllerTest.php
similarity index 98%
rename from test/classes/controllers/TableSearchControllerTest.php
rename to test/classes/Controllers/Table/TableSearchControllerTest.php
index 09c08caa75..13f7a8f1ec 100644
--- a/test/classes/controllers/TableSearchControllerTest.php
+++ b/test/classes/Controllers/Table/TableSearchControllerTest.php
@@ -5,25 +5,23 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Controllers\Table;
 
-/*
- * Include to test.
- */
 use PhpMyAdmin\Controllers\Table\TableSearchController;
 use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Relation;
 use PhpMyAdmin\Tests\Stubs\Response as ResponseStub;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\TypesMySQL;
-
-require_once 'test/PMATestCase.php';
+use ReflectionClass;
+use stdClass;
 
 /**
  * Tests for PMA_TableSearch
  *
  * @package PhpMyAdmin-test
  */
-class TableSearchControllerTest extends PMATestCase
+class TableSearchControllerTest extends \PMATestCase
 {
     /**
      * @var PhpMyAdmin\Tests\Stubs\Response
diff --git a/test/classes/controllers/TableStructureControllerTest.php b/test/classes/Controllers/Table/TableStructureControllerTest.php
similarity index 98%
rename from test/classes/controllers/TableStructureControllerTest.php
rename to test/classes/Controllers/Table/TableStructureControllerTest.php
index 6e9ed8170d..249ed184ba 100644
--- a/test/classes/controllers/TableStructureControllerTest.php
+++ b/test/classes/Controllers/Table/TableStructureControllerTest.php
@@ -7,15 +7,12 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Controllers\Table;
 
-/*
- * Include to test.
- */
 use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Tests\Stubs\Response as ResponseStub;
 use PhpMyAdmin\Theme;
-
-require_once 'test/PMATestCase.php';
+use ReflectionClass;
 
 /**
  * TableStructureController_Test class
@@ -24,7 +21,7 @@ require_once 'test/PMATestCase.php';
  *
  * @package PhpMyAdmin-test
  */
-class TableStructureControllerTest extends PMATestCase
+class TableStructureControllerTest extends \PMATestCase
 {
     /**
      * @var \PhpMyAdmin\Tests\Stubs\Response
diff --git a/test/classes/CoreTest.php b/test/classes/CoreTest.php
index e2c6c3232b..136166ac02 100644
--- a/test/classes/CoreTest.php
+++ b/test/classes/CoreTest.php
@@ -5,22 +5,19 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
-require_once 'test/PMATestCase.php';
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Config;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Sanitize;
+use stdClass;
 
 /**
  * Tests for PhpMyAdmin\Core class
  *
  * @package PhpMyAdmin-test
  */
-class CoreTest extends PMATestCase
+class CoreTest extends \PMATestCase
 {
     protected $goto_whitelist = array(
         'db_datadict.php',
diff --git a/test/classes/Database/DesignerTest.php b/test/classes/Database/DesignerTest.php
index c3039e69c7..8889a16b5c 100644
--- a/test/classes/Database/DesignerTest.php
+++ b/test/classes/Database/DesignerTest.php
@@ -8,13 +8,14 @@ namespace PhpMyAdmin\Tests\Database;
 
 use PhpMyAdmin\Database\Designer;
 use PhpMyAdmin\DatabaseInterface;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * Tests for PhpMyAdmin\Database\Designer
  *
  * @package PhpMyAdmin-test
  */
-class DesignerTest extends \PHPUnit_Framework_TestCase
+class DesignerTest extends TestCase
 {
 
     /**
diff --git a/test/classes/DatabaseInterfaceTest.php b/test/classes/DatabaseInterfaceTest.php
index f537428cc3..c92e22554e 100644
--- a/test/classes/DatabaseInterfaceTest.php
+++ b/test/classes/DatabaseInterfaceTest.php
@@ -5,20 +5,19 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\DatabaseInterface;
+use PhpMyAdmin\Dbi\DbiDummy;
 use PhpMyAdmin\Util;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests basic functionality of dummy dbi driver
  *
  * @package PhpMyAdmin-test
  */
-class DatabaseInterfaceTest extends PMATestCase
+class DatabaseInterfaceTest extends \PMATestCase
 {
-
     private $_dbi;
 
     /**
@@ -28,7 +27,7 @@ class DatabaseInterfaceTest extends PMATestCase
      */
     function setup()
     {
-        $extension = new PhpMyAdmin\Dbi\DbiDummy();
+        $extension = new DbiDummy();
         $this->_dbi = new DatabaseInterface($extension);
     }
 
@@ -43,7 +42,7 @@ class DatabaseInterfaceTest extends PMATestCase
     {
         Util::cacheUnset('mysql_cur_user');
 
-        $extension = new PhpMyAdmin\Dbi\DbiDummy();
+        $extension = new DbiDummy();
         $extension->setResult('SELECT CURRENT_USER();', $value);
 
         $dbi = new DatabaseInterface($extension);
@@ -387,7 +386,7 @@ class DatabaseInterfaceTest extends PMATestCase
     {
         Util::cacheUnset('is_amazon_rds');
 
-        $extension = new PhpMyAdmin\Dbi\DbiDummy();
+        $extension = new DbiDummy();
         $extension->setResult('SELECT @@basedir', $value);
 
         $dbi = new DatabaseInterface($extension);
diff --git a/test/classes/DbQbeTest.php b/test/classes/DbQbeTest.php
index b61cd5d3bb..cf503a0854 100644
--- a/test/classes/DbQbeTest.php
+++ b/test/classes/DbQbeTest.php
@@ -4,21 +4,17 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
-
-require_once 'test/PMATestCase.php';
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\DbQbe;
+use ReflectionClass;
 
 /**
  * Tests for PhpMyAdmin\DbQbe class
  *
  *  @package PhpMyAdmin-test
  */
-class DbQbeTest extends PMATestCase
+class DbQbeTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/DbSearchTest.php b/test/classes/DbSearchTest.php
index 5f84259d2b..2d2fb7ec54 100644
--- a/test/classes/DbSearchTest.php
+++ b/test/classes/DbSearchTest.php
@@ -4,22 +4,18 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
-
-require_once 'test/PMATestCase.php';
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\DbSearch;
 use PhpMyAdmin\Theme;
+use ReflectionClass;
 
 /**
  * Tests for database search.
  *
  * @package PhpMyAdmin-test
  */
-class DbSearchTest extends PMATestCase
+class DbSearchTest extends \PMATestCase
 {
     /**
      * @access protected
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
diff --git a/test/classes/di/ContainerExceptionTest.php b/test/classes/Di/ContainerExceptionTest.php
similarity index 92%
rename from test/classes/di/ContainerExceptionTest.php
rename to test/classes/Di/ContainerExceptionTest.php
index cd8606fd62..252cdc9251 100644
--- a/test/classes/di/ContainerExceptionTest.php
+++ b/test/classes/Di/ContainerExceptionTest.php
@@ -5,11 +5,7 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
-require_once 'test/PMATestCase.php';
+namespace PhpMyAdmin\Tests\Di;
 
 use PhpMyAdmin\Di\ContainerException;
 
@@ -18,7 +14,7 @@ use PhpMyAdmin\Di\ContainerException;
  *
  * @package PhpMyAdmin-test
  */
-class ContainerExceptionTest extends PMATestCase
+class ContainerExceptionTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/di/ContainerTest.php b/test/classes/Di/ContainerTest.php
similarity index 94%
rename from test/classes/di/ContainerTest.php
rename to test/classes/Di/ContainerTest.php
index 043013eb09..c07279d9e8 100644
--- a/test/classes/di/ContainerTest.php
+++ b/test/classes/Di/ContainerTest.php
@@ -5,11 +5,7 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
-require_once 'test/PMATestCase.php';
+namespace PhpMyAdmin\Tests\Di;
 
 use PhpMyAdmin\Di\Container;
 
@@ -18,7 +14,7 @@ use PhpMyAdmin\Di\Container;
  *
  * @package PhpMyAdmin-test
  */
-class ContainerTest extends PMATestCase
+class ContainerTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/di/NotFoundExceptionTest.php b/test/classes/Di/NotFoundExceptionTest.php
similarity index 93%
rename from test/classes/di/NotFoundExceptionTest.php
rename to test/classes/Di/NotFoundExceptionTest.php
index c317a611c5..29054f2fb1 100644
--- a/test/classes/di/NotFoundExceptionTest.php
+++ b/test/classes/Di/NotFoundExceptionTest.php
@@ -5,11 +5,7 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
-require_once 'test/PMATestCase.php';
+namespace PhpMyAdmin\Tests\Di;
 
 use PhpMyAdmin\Di\NotFoundException;
 
@@ -18,7 +14,7 @@ use PhpMyAdmin\Di\NotFoundException;
  *
  * @package PhpMyAdmin-test
  */
-class NotFoundExceptionTest extends PMATestCase
+class NotFoundExceptionTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/Display/ChangePasswordTest.php b/test/classes/Display/ChangePasswordTest.php
index 1c37d3fcab..860bb38829 100644
--- a/test/classes/Display/ChangePasswordTest.php
+++ b/test/classes/Display/ChangePasswordTest.php
@@ -11,6 +11,7 @@ use PhpMyAdmin\Config;
 use PhpMyAdmin\Display\ChangePassword;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Url;
+use PHPUnit_Framework_TestCase as TestCase;
 
 require_once 'libraries/config.default.php';
 
@@ -21,7 +22,7 @@ require_once 'libraries/config.default.php';
  *
  * @package PhpMyAdmin-test
  */
-class ChangePasswordTest extends \PHPUnit_Framework_TestCase
+class ChangePasswordTest extends TestCase
 {
     /**
      * Test for setUp
diff --git a/test/classes/Display/CreateTableTest.php b/test/classes/Display/CreateTableTest.php
index 40977257b2..bd221de8fb 100644
--- a/test/classes/Display/CreateTableTest.php
+++ b/test/classes/Display/CreateTableTest.php
@@ -11,6 +11,7 @@ use PhpMyAdmin\Display\CreateTable;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * PhpMyAdmin\Tests\Display\CreateTableTest class
@@ -19,7 +20,7 @@ use PhpMyAdmin\Util;
  *
  * @package PhpMyAdmin-test
  */
-class CreateTableTest extends \PHPUnit_Framework_TestCase
+class CreateTableTest extends TestCase
 {
     /**
      * Test for setUp
diff --git a/test/classes/Display/ExportTest.php b/test/classes/Display/ExportTest.php
index 5ca4ae8b41..d94d78f71c 100644
--- a/test/classes/Display/ExportTest.php
+++ b/test/classes/Display/ExportTest.php
@@ -13,6 +13,7 @@ use PhpMyAdmin\Plugins;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * class PhpMyAdmin\Tests\Display\ExportTest
@@ -22,7 +23,7 @@ use PhpMyAdmin\Util;
  * @package PhpMyAdmin-test
  * @group large
  */
-class ExportTest extends \PHPUnit_Framework_TestCase
+class ExportTest extends TestCase
 {
     /**
      * Test for setUp
diff --git a/test/classes/Display/ResultsTest.php b/test/classes/Display/ResultsTest.php
index f3eb93260a..078262240a 100644
--- a/test/classes/Display/ResultsTest.php
+++ b/test/classes/Display/ResultsTest.php
@@ -16,11 +16,6 @@ use PhpMyAdmin\Transformations;
 use ReflectionClass;
 use stdClass;
 
-/*
-* Include to test.
-*/
-require_once 'test/PMATestCase.php';
-
 /**
  * Test cases for displaying results.
  *
diff --git a/test/classes/EncodingTest.php b/test/classes/EncodingTest.php
index 5860f7faf3..fe7475543a 100644
--- a/test/classes/EncodingTest.php
+++ b/test/classes/EncodingTest.php
@@ -5,15 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Encoding;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * Tests for Charset Conversions
  *
  * @package PhpMyAdmin-test
  */
-class EncodingTest extends PHPUnit_Framework_TestCase
+class EncodingTest extends TestCase
 {
     public function setUp()
     {
diff --git a/test/classes/engines/BdbTest.php b/test/classes/Engines/BdbTest.php
similarity index 96%
rename from test/classes/engines/BdbTest.php
rename to test/classes/Engines/BdbTest.php
index e6493ed0ae..b01d8856f8 100644
--- a/test/classes/engines/BdbTest.php
+++ b/test/classes/Engines/BdbTest.php
@@ -4,21 +4,16 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
+namespace PhpMyAdmin\Tests\Engines;
 
 use PhpMyAdmin\Engines\Bdb;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Engines\Bdb
  *
  * @package PhpMyAdmin-test
  */
-class BdbTest extends PMATestCase
+class BdbTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/engines/BinlogTest.php b/test/classes/Engines/BinlogTest.php
similarity index 91%
rename from test/classes/engines/BinlogTest.php
rename to test/classes/Engines/BinlogTest.php
index aef7ad3272..4697095ac5 100644
--- a/test/classes/engines/BinlogTest.php
+++ b/test/classes/Engines/BinlogTest.php
@@ -4,21 +4,16 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
+namespace PhpMyAdmin\Tests\Engines;
 
 use PhpMyAdmin\Engines\Binlog;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Engines\Binlog
  *
  * @package PhpMyAdmin-test
  */
-class BinlogTest extends PMATestCase
+class BinlogTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/engines/InnodbTest.php b/test/classes/Engines/InnodbTest.php
similarity index 98%
rename from test/classes/engines/InnodbTest.php
rename to test/classes/Engines/InnodbTest.php
index b25fa26ffa..efb19c2f8c 100644
--- a/test/classes/engines/InnodbTest.php
+++ b/test/classes/Engines/InnodbTest.php
@@ -4,21 +4,16 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
+namespace PhpMyAdmin\Tests\Engines;
 
 use PhpMyAdmin\Engines\Innodb;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Engines\Innodb
  *
  * @package PhpMyAdmin-test
  */
-class InnodbTest extends PMATestCase
+class InnodbTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/engines/MemoryTest.php b/test/classes/Engines/MemoryTest.php
similarity index 92%
rename from test/classes/engines/MemoryTest.php
rename to test/classes/Engines/MemoryTest.php
index 89050b9c16..65a68e3970 100644
--- a/test/classes/engines/MemoryTest.php
+++ b/test/classes/Engines/MemoryTest.php
@@ -4,21 +4,16 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
+namespace PhpMyAdmin\Tests\Engines;
 
 use PhpMyAdmin\Engines\Memory;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Engines\Memory
  *
  * @package PhpMyAdmin-test
  */
-class MemoryTest extends PMATestCase
+class MemoryTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/engines/MrgMyisamTest.php b/test/classes/Engines/MrgMyisamTest.php
similarity index 91%
rename from test/classes/engines/MrgMyisamTest.php
rename to test/classes/Engines/MrgMyisamTest.php
index 63f6826986..2cad7855f0 100644
--- a/test/classes/engines/MrgMyisamTest.php
+++ b/test/classes/Engines/MrgMyisamTest.php
@@ -4,21 +4,16 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
+namespace PhpMyAdmin\Tests\Engines;
 
 use PhpMyAdmin\Engines\MrgMyisam;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Engines\MrgMyisam
  *
  * @package PhpMyAdmin-test
  */
-class MrgMyisamTest extends PMATestCase
+class MrgMyisamTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/engines/MyisamTest.php b/test/classes/Engines/MyisamTest.php
similarity index 97%
rename from test/classes/engines/MyisamTest.php
rename to test/classes/Engines/MyisamTest.php
index 3aadb3e95d..c1eda49f55 100644
--- a/test/classes/engines/MyisamTest.php
+++ b/test/classes/Engines/MyisamTest.php
@@ -4,21 +4,16 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
+namespace PhpMyAdmin\Tests\Engines;
 
 use PhpMyAdmin\Engines\Myisam;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Engines\Myisam
  *
  * @package PhpMyAdmin-test
  */
-class MyisamTest extends PMATestCase
+class MyisamTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/engines/NdbclusterTest.php b/test/classes/Engines/NdbclusterTest.php
similarity index 94%
rename from test/classes/engines/NdbclusterTest.php
rename to test/classes/Engines/NdbclusterTest.php
index bdd9af4e3a..cf44dab264 100644
--- a/test/classes/engines/NdbclusterTest.php
+++ b/test/classes/Engines/NdbclusterTest.php
@@ -4,21 +4,16 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
+namespace PhpMyAdmin\Tests\Engines;
 
 use PhpMyAdmin\Engines\Ndbcluster;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Engines\Ndbcluster
  *
  * @package PhpMyAdmin-test
  */
-class NdbclusterTest extends PMATestCase
+class NdbclusterTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/engines/PbxtTest.php b/test/classes/Engines/PbxtTest.php
similarity index 98%
rename from test/classes/engines/PbxtTest.php
rename to test/classes/Engines/PbxtTest.php
index 0c3314f29c..44fdc409d2 100644
--- a/test/classes/engines/PbxtTest.php
+++ b/test/classes/Engines/PbxtTest.php
@@ -5,22 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
+namespace PhpMyAdmin\Tests\Engines;
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Engines\Pbxt;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Engines\Pbxt;
  *
  * @package PhpMyAdmin-test
  */
-class PbxtTest extends PMATestCase
+class PbxtTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/ErrorHandlerTest.php b/test/classes/ErrorHandlerTest.php
index f6118fc78a..2d3e9e519c 100644
--- a/test/classes/ErrorHandlerTest.php
+++ b/test/classes/ErrorHandlerTest.php
@@ -4,22 +4,18 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\ErrorHandler;
 use PhpMyAdmin\Theme;
-
-require_once 'test/PMATestCase.php';
+use ReflectionClass;
 
 /**
  * Test for PhpMyAdmin\ErrorHandler class.
  *
  * @package PhpMyAdmin-test
  */
-class ErrorHandlerTest extends PMATestCase
+class ErrorHandlerTest extends \PMATestCase
 {
     /**
      * @access protected
@@ -36,7 +32,6 @@ class ErrorHandlerTest extends PMATestCase
     protected function setUp()
     {
         $this->object = new ErrorHandler();
-
     }
 
     /**
diff --git a/test/classes/ErrorTest.php b/test/classes/ErrorTest.php
index fd002b8d4e..fdefdada87 100644
--- a/test/classes/ErrorTest.php
+++ b/test/classes/ErrorTest.php
@@ -5,22 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Error;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Error class testing.
  *
  * @package PhpMyAdmin-test
  */
-class ErrorTest extends PMATestCase
+class ErrorTest extends \PMATestCase
 {
     /**
      * @access protected
@@ -60,7 +55,7 @@ class ErrorTest extends PMATestCase
     {
         $bt = array(array('file'=>'bt1','line'=>2, 'function'=>'bar', 'args'=>array('foo'=>$this)));
         $this->object->setBacktrace($bt);
-        $bt[0]['args']['foo'] = '<Class:ErrorTest>';
+        $bt[0]['args']['foo'] = '<Class:PhpMyAdmin\Tests\ErrorTest>';
         $this->assertEquals($bt, $this->object->getBacktrace());
     }
 
@@ -123,7 +118,7 @@ class ErrorTest extends PMATestCase
     public function testGetBacktraceDisplay()
     {
         $this->assertContains(
-            'PHPUnit_Framework_TestResult->run(<Class:ErrorTest>)<br />',
+            'PHPUnit_Framework_TestResult->run(<Class:PhpMyAdmin\Tests\ErrorTest>)<br />',
             $this->object->getBacktraceDisplay()
         );
     }
diff --git a/test/classes/ExportTest.php b/test/classes/ExportTest.php
index 5fff46d1ca..d56e0a1693 100644
--- a/test/classes/ExportTest.php
+++ b/test/classes/ExportTest.php
@@ -8,6 +8,7 @@
 namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Export;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * PhpMyAdmin\ExportTest class
@@ -17,7 +18,7 @@ use PhpMyAdmin\Export;
  * @package PhpMyAdmin-test
  * @group large
  */
-class ExportTest extends \PHPUnit_Framework_TestCase
+class ExportTest extends TestCase
 {
     /**
      * Test for Export::mergeAliases
diff --git a/test/classes/FileTest.php b/test/classes/FileTest.php
index a9898079d7..7e39ec5738 100644
--- a/test/classes/FileTest.php
+++ b/test/classes/FileTest.php
@@ -1,19 +1,20 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PhpMyAdmin\File class
+ * tests for File class
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests;
 
-require_once 'test/PMATestCase.php';
+use PhpMyAdmin\File;
 
 /**
  * tests for PhpMyAdmin\File class
  *
  * @package PhpMyAdmin-test
  */
-class FileTest extends PMATestCase
+class FileTest extends \PMATestCase
 {
     /**
      * Setup function for test cases
@@ -26,7 +27,7 @@ class FileTest extends PMATestCase
     }
 
     /**
-     * Test for PhpMyAdmin\File::getCompression
+     * Test for File::getCompression
      *
      * @param string $file file string
      * @param string $mime expected mime
@@ -36,12 +37,12 @@ class FileTest extends PMATestCase
      */
     public function testMIME($file, $mime)
     {
-        $arr = new PhpMyAdmin\File($file);
+        $arr = new File($file);
         $this->assertEquals($mime, $arr->getCompression());
     }
 
     /**
-     * Test for PhpMyAdmin\File::getContent
+     * Test for File::getContent
      *
      * @param string $file file string
      *
@@ -51,12 +52,12 @@ class FileTest extends PMATestCase
     public function testBinaryContent($file)
     {
         $data = '0x' . bin2hex(file_get_contents($file));
-        $file = new PhpMyAdmin\File($file);
+        $file = new File($file);
         $this->assertEquals($data, $file->getContent());
     }
 
     /**
-     * Test for PhpMyAdmin\File::read
+     * Test for File::read
      *
      * @param string $file file string
      *
@@ -65,7 +66,7 @@ class FileTest extends PMATestCase
      */
     public function testReadCompressed($file)
     {
-        $file = new PhpMyAdmin\File($file);
+        $file = new File($file);
         $file->setDecompressContent(true);
         $file->open();
         $this->assertEquals("TEST FILE\n", $file->read(100));
diff --git a/test/classes/FontTest.php b/test/classes/FontTest.php
index fcf4163232..a996ac52dd 100644
--- a/test/classes/FontTest.php
+++ b/test/classes/FontTest.php
@@ -4,17 +4,16 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Font;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Font class
  *
  * @package PhpMyAdmin-test
  */
-class FontTest extends PMATestCase
+class FontTest extends \PMATestCase
 {
     /**
      * Test getStringWidth with different characters.
diff --git a/test/classes/FooterTest.php b/test/classes/FooterTest.php
index 92f66a327b..bc3b027574 100644
--- a/test/classes/FooterTest.php
+++ b/test/classes/FooterTest.php
@@ -4,24 +4,20 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Config;
 use PhpMyAdmin\ErrorHandler;
 use PhpMyAdmin\Footer;
 use PhpMyAdmin\Theme;
-
-require_once 'test/PMATestCase.php';
+use ReflectionClass;
 
 /**
  * Tests for Footer class
  *
  * @package PhpMyAdmin-test
  */
-class FooterTest extends PMATestCase
+class FooterTest extends \PMATestCase
 {
 
     /**
diff --git a/test/classes/gis/GisFactoryTest.php b/test/classes/Gis/GisFactoryTest.php
similarity index 93%
rename from test/classes/gis/GisFactoryTest.php
rename to test/classes/Gis/GisFactoryTest.php
index 685fd30ba6..041cade84e 100644
--- a/test/classes/gis/GisFactoryTest.php
+++ b/test/classes/Gis/GisFactoryTest.php
@@ -5,14 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Gis;
+
 use PhpMyAdmin\Gis\GisFactory;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * Test class for PhpMyAdmin\Gis\GisFactory
  *
  * @package PhpMyAdmin-test
  */
-class GisFactoryTest extends PHPUnit_Framework_TestCase
+class GisFactoryTest extends TestCase
 {
 
     /**
diff --git a/test/classes/gis/GisGeomTest.php b/test/classes/Gis/GisGeomTest.php
similarity index 92%
rename from test/classes/gis/GisGeomTest.php
rename to test/classes/Gis/GisGeomTest.php
index a2ef32c8c1..a9a8b80225 100644
--- a/test/classes/gis/GisGeomTest.php
+++ b/test/classes/Gis/GisGeomTest.php
@@ -5,13 +5,16 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Gis;
+
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * Abstract parent class for all GIS<Geom_type> test classes
  *
  * @package PhpMyAdmin-test
  */
-abstract class GisGeomTest extends PHPUnit_Framework_TestCase
+abstract class GisGeomTest extends TestCase
 {
 
     /**
diff --git a/test/classes/gis/GisGeometryCollectionTest.php b/test/classes/Gis/GisGeometryCollectionTest.php
similarity index 98%
rename from test/classes/gis/GisGeometryCollectionTest.php
rename to test/classes/Gis/GisGeometryCollectionTest.php
index 8116752a0f..4bfb09044b 100644
--- a/test/classes/gis/GisGeometryCollectionTest.php
+++ b/test/classes/Gis/GisGeometryCollectionTest.php
@@ -6,15 +6,18 @@
  *
  * @package PhpMyAdmin-test
  */
-use PhpMyAdmin\Gis\GisGeometryCollection;
+namespace PhpMyAdmin\Tests\Gis;
 
+use PhpMyAdmin\Gis\GisGeometryCollection;
+use PHPUnit_Framework_TestCase as TestCase;
+use TCPDF;
 
 /**
  * Tests for PhpMyAdmin\Gis\GisGeometryCollection class
  *
  * @package PhpMyAdmin-test
  */
-class GisGeometryCollectionTest extends PHPUnit_Framework_TestCase
+class GisGeometryCollectionTest extends TestCase
 {
 
     /**
@@ -268,7 +271,7 @@ class GisGeometryCollectionTest extends PHPUnit_Framework_TestCase
                     'scale' => 2,
                     'height' => 150
                 ),
-                new \TCPDF(),
+                new TCPDF(),
             )
         );
     }
diff --git a/test/classes/gis/GisGeometryTest.php b/test/classes/Gis/GisGeometryTest.php
similarity index 98%
rename from test/classes/gis/GisGeometryTest.php
rename to test/classes/Gis/GisGeometryTest.php
index f343500419..51c74c0e40 100644
--- a/test/classes/gis/GisGeometryTest.php
+++ b/test/classes/Gis/GisGeometryTest.php
@@ -5,13 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Gis;
+
+use PHPUnit_Framework_TestCase as TestCase;
+use ReflectionClass;
 
 /**
  * Tests for PhpMyAdmin\Gis\GisGeometry class
  *
  * @package PhpMyAdmin-test
  */
-class GisGeometryTest extends PHPUnit_Framework_TestCase
+class GisGeometryTest extends TestCase
 {
     /**
      * @access protected
diff --git a/test/classes/gis/GisLineStringTest.php b/test/classes/Gis/GisLineStringTest.php
similarity index 99%
rename from test/classes/gis/GisLineStringTest.php
rename to test/classes/Gis/GisLineStringTest.php
index 79544da360..59cfdc0db7 100644
--- a/test/classes/gis/GisLineStringTest.php
+++ b/test/classes/Gis/GisLineStringTest.php
@@ -5,10 +5,11 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Gis;
 
 use PhpMyAdmin\Gis\GisLineString;
-
-require_once 'GisGeomTest.php';
+use PhpMyAdmin\Tests\Gis\GisGeomTest;
+use TCPDF;
 
 /**
  * Tests for PhpMyAdmin\Gis\GisLineString class
diff --git a/test/classes/gis/GisMultiLineStringTest.php b/test/classes/Gis/GisMultiLineStringTest.php
similarity index 99%
rename from test/classes/gis/GisMultiLineStringTest.php
rename to test/classes/Gis/GisMultiLineStringTest.php
index 16caefb5e5..b37594bf1d 100644
--- a/test/classes/gis/GisMultiLineStringTest.php
+++ b/test/classes/Gis/GisMultiLineStringTest.php
@@ -5,10 +5,11 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Gis;
 
 use PhpMyAdmin\Gis\GisMultiLineString;
-
-require_once 'GisGeomTest.php';
+use PhpMyAdmin\Tests\Gis\GisGeomTest;
+use TCPDF;
 
 /**
  * Tests for PhpMyAdmin\Gis\GisMultiLineString class
diff --git a/test/classes/gis/GisMultiPointTest.php b/test/classes/Gis/GisMultiPointTest.php
similarity index 99%
rename from test/classes/gis/GisMultiPointTest.php
rename to test/classes/Gis/GisMultiPointTest.php
index 254e4b60fd..3ac100e2a4 100644
--- a/test/classes/gis/GisMultiPointTest.php
+++ b/test/classes/Gis/GisMultiPointTest.php
@@ -5,10 +5,11 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Gis;
 
 use PhpMyAdmin\Gis\GisMultiPoint;
-
-require_once 'GisGeomTest.php';
+use PhpMyAdmin\Tests\Gis\GisGeomTest;
+use TCPDF;
 
 /**
  * Tests for PhpMyAdmin\Gis\GisMultiPoint class
diff --git a/test/classes/gis/GisMultiPolygonTest.php b/test/classes/Gis/GisMultiPolygonTest.php
similarity index 99%
rename from test/classes/gis/GisMultiPolygonTest.php
rename to test/classes/Gis/GisMultiPolygonTest.php
index 0557f7a8c7..a346a55686 100644
--- a/test/classes/gis/GisMultiPolygonTest.php
+++ b/test/classes/Gis/GisMultiPolygonTest.php
@@ -5,10 +5,11 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Gis;
 
 use PhpMyAdmin\Gis\GisMultiPolygon;
-
-require_once 'GisGeomTest.php';
+use PhpMyAdmin\Tests\Gis\GisGeomTest;
+use TCPDF;
 
 /**
  * Tests for PhpMyAdmin\Gis\GisMultiPolygon class
diff --git a/test/classes/gis/GisPointTest.php b/test/classes/Gis/GisPointTest.php
similarity index 99%
rename from test/classes/gis/GisPointTest.php
rename to test/classes/Gis/GisPointTest.php
index b680a56990..cf321458ac 100644
--- a/test/classes/gis/GisPointTest.php
+++ b/test/classes/Gis/GisPointTest.php
@@ -5,10 +5,11 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Gis;
 
 use PhpMyAdmin\Gis\GisPoint;
-
-require_once 'GisGeomTest.php';
+use PhpMyAdmin\Tests\Gis\GisGeomTest;
+use TCPDF;
 
 /**
  * Tests for PhpMyAdmin\Gis\GisPoint class.
diff --git a/test/classes/gis/GisPolygonTest.php b/test/classes/Gis/GisPolygonTest.php
similarity index 99%
rename from test/classes/gis/GisPolygonTest.php
rename to test/classes/Gis/GisPolygonTest.php
index 2a6b7bfb79..6f55e514f4 100644
--- a/test/classes/gis/GisPolygonTest.php
+++ b/test/classes/Gis/GisPolygonTest.php
@@ -5,10 +5,11 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Gis;
 
 use PhpMyAdmin\Gis\GisPolygon;
-
-require_once 'GisGeomTest.php';
+use PhpMyAdmin\Tests\Gis\GisGeomTest;
+use TCPDF;
 
 /**
  * Tests for PhpMyAdmin\Gis\GisPolygon class
diff --git a/test/classes/HeaderTest.php b/test/classes/HeaderTest.php
index ce328d509f..943b9e295a 100644
--- a/test/classes/HeaderTest.php
+++ b/test/classes/HeaderTest.php
@@ -5,13 +5,13 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Config;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Header;
 use PhpMyAdmin\Theme;
-
-require_once 'test/PMATestCase.php';
+use ReflectionMethod;
 
 /**
  * Test for PhpMyAdmin\Header class
@@ -19,7 +19,7 @@ require_once 'test/PMATestCase.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class HeaderTest extends PMATestCase
+class HeaderTest extends \PMATestCase
 {
     /**
      * Configures global environment.
diff --git a/test/classes/ImportTest.php b/test/classes/ImportTest.php
index ad3e4fc7d5..2a38ffd2e5 100644
--- a/test/classes/ImportTest.php
+++ b/test/classes/ImportTest.php
@@ -11,6 +11,7 @@ use PhpMyAdmin\Import;
 use PhpMyAdmin\SqlParser\Parser;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /*
  * we must set $GLOBALS['server'] here
@@ -18,16 +19,12 @@ use PhpMyAdmin\Util;
  */
 $GLOBALS['server'] = 0;
 
-/*
- * Include to test.
- */
-
 /**
  * Tests for import functions
  *
  * @package PhpMyAdmin-test
  */
-class ImportTest extends \PHPUnit_Framework_TestCase
+class ImportTest extends TestCase
 {
     /**
      * Prepares environment for the test.
diff --git a/test/classes/IndexTest.php b/test/classes/IndexTest.php
index 7dcfc1478f..b8593d8a64 100644
--- a/test/classes/IndexTest.php
+++ b/test/classes/IndexTest.php
@@ -5,17 +5,16 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Index;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Test for Index class
  *
  * @package PhpMyAdmin-test
  */
-class IndexTest extends PMATestCase
+class IndexTest extends \PMATestCase
 {
     private $_params = array();
 
diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php
index 89e36ece94..9e9057256a 100644
--- a/test/classes/InsertEditTest.php
+++ b/test/classes/InsertEditTest.php
@@ -16,17 +16,17 @@ use PhpMyAdmin\Theme;
 use PhpMyAdmin\Tracker;
 use PhpMyAdmin\Types;
 use PhpMyAdmin\TypesMySQL;
+use PHPUnit_Framework_TestCase as TestCase;
 use ReflectionProperty;
 use stdClass;
 
-
 /**
  * Tests for PhpMyAdmin\InsertEdit
  *
  * @package PhpMyAdmin-test
  * @group medium
  */
-class InsertEditTest extends \PHPUnit_Framework_TestCase
+class InsertEditTest extends TestCase
 {
     /**
      * Setup for test cases
diff --git a/test/classes/IpAllowDenyTest.php b/test/classes/IpAllowDenyTest.php
index a54661e509..6aafbb0e49 100644
--- a/test/classes/IpAllowDenyTest.php
+++ b/test/classes/IpAllowDenyTest.php
@@ -9,6 +9,7 @@ namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\IpAllowDeny;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * PhpMyAdmin\Tests\IpAllowDenyTest class
@@ -17,7 +18,7 @@ use PhpMyAdmin\IpAllowDeny;
  *
  * @package PhpMyAdmin-test
  */
-class IpAllowDenyTest extends \PHPUnit_Framework_TestCase
+class IpAllowDenyTest extends TestCase
 {
     /**
      * Prepares environment for the test.
diff --git a/test/classes/LanguageTest.php b/test/classes/LanguageTest.php
index f550e56e92..b227a5d750 100644
--- a/test/classes/LanguageTest.php
+++ b/test/classes/LanguageTest.php
@@ -5,10 +5,7 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\LanguageManager;
 
@@ -17,7 +14,7 @@ use PhpMyAdmin\LanguageManager;
  *
  * @package PhpMyAdmin-test
  */
-class LanguageTest extends PMATestCase
+class LanguageTest extends \PMATestCase
 {
     private $manager;
 
diff --git a/test/classes/LinterTest.php b/test/classes/LinterTest.php
index e4f76c0fc8..4bbcfa347e 100644
--- a/test/classes/LinterTest.php
+++ b/test/classes/LinterTest.php
@@ -5,22 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests;
 
-/*
- * Include to test.
- */
 use PhpMyAdmin\Linter;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Linter
  *
  * @package PhpMyAdmin-test
  */
-class LinterTest extends PMATestCase
+class LinterTest extends \PMATestCase
 {
-
     /**
      * Test for Linter::getLines
      *
diff --git a/test/classes/ListDatabaseTest.php b/test/classes/ListDatabaseTest.php
index d3b1485211..2cb346e238 100644
--- a/test/classes/ListDatabaseTest.php
+++ b/test/classes/ListDatabaseTest.php
@@ -5,22 +5,20 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\ListDatabase;
+use ReflectionClass;
 
 $GLOBALS['server'] = 1;
 $GLOBALS['cfg']['Server']['DisableIS'] = false;
-/*
- * Include to test.
- */
-require_once 'test/PMATestCase.php';
 
 /**
  * tests for ListDatabase class
  *
  * @package PhpMyAdmin-test
  */
-class ListDatabaseTest extends PMATestCase
+class ListDatabaseTest extends \PMATestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/MenuTest.php b/test/classes/MenuTest.php
index 0729c80cc0..e424bee6b0 100644
--- a/test/classes/MenuTest.php
+++ b/test/classes/MenuTest.php
@@ -5,22 +5,18 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests;
 
-/*
- * Include to test.
- */
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Menu;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Test for Menu class
  *
  * @package PhpMyAdmin-test
  */
-class MenuTest extends PMATestCase
+class MenuTest extends \PMATestCase
 {
     /**
      * Configures global environment.
diff --git a/test/classes/MessageTest.php b/test/classes/MessageTest.php
index 04e5d5db79..adb0dccd6a 100644
--- a/test/classes/MessageTest.php
+++ b/test/classes/MessageTest.php
@@ -5,18 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Test for Message class
  *
  * @package PhpMyAdmin-test
  */
-class MessageTest extends PMATestCase
+class MessageTest extends \PMATestCase
 {
     /**
      * @var    PhpMyAdmin\Message
diff --git a/test/classes/MimeTest.php b/test/classes/MimeTest.php
index 5d0a09bd8d..a7f9ffbdbb 100644
--- a/test/classes/MimeTest.php
+++ b/test/classes/MimeTest.php
@@ -5,16 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
-namespace PhpMyAdmin;
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Mime;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * Test for mime detection.
  *
  * @package PhpMyAdmin-test
  */
-class MimeTest extends \PHPUnit_Framework_TestCase
+class MimeTest extends TestCase
 {
     /**
      * Test for Mime::detect
diff --git a/test/classes/MultSubmitsTest.php b/test/classes/MultSubmitsTest.php
index 11df782139..227428ce1d 100644
--- a/test/classes/MultSubmitsTest.php
+++ b/test/classes/MultSubmitsTest.php
@@ -10,6 +10,7 @@ namespace PhpMyAdmin\Tests;
 use PhpMyAdmin\MultSubmits;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Url;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * PhpMyAdmin\Tests\MultSubmitsTest class
@@ -18,7 +19,7 @@ use PhpMyAdmin\Url;
  *
  * @package PhpMyAdmin-test
  */
-class MultSubmitsTest extends \PHPUnit_Framework_TestCase
+class MultSubmitsTest extends TestCase
 {
     /**
      * Test for setUp
diff --git a/test/classes/navigation/NavigationTest.php b/test/classes/Navigation/NavigationTest.php
similarity index 96%
rename from test/classes/navigation/NavigationTest.php
rename to test/classes/Navigation/NavigationTest.php
index f42e2ffe06..585c406427 100644
--- a/test/classes/navigation/NavigationTest.php
+++ b/test/classes/Navigation/NavigationTest.php
@@ -5,18 +5,18 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Navigation;
 
+use PhpMyAdmin\Navigation\Navigation;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Url;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Navigation\Navigation class
  *
  * @package PhpMyAdmin-test
  */
-class NavigationTest extends PMATestCase
+class NavigationTest extends \PMATestCase
 {
     /**
      * @var PhpMyAdmin\Navigation\Navigation
@@ -31,7 +31,7 @@ class NavigationTest extends PMATestCase
      */
     protected function setUp()
     {
-        $this->object = new PhpMyAdmin\Navigation\Navigation();
+        $this->object = new Navigation();
         $GLOBALS['cfgRelation']['db'] = 'pmadb';
         $GLOBALS['cfgRelation']['navigationhiding'] = 'navigationhiding';
         $GLOBALS['cfg']['Server']['user'] = 'user';
diff --git a/test/classes/navigation/NavigationTreeTest.php b/test/classes/Navigation/NavigationTreeTest.php
similarity index 91%
rename from test/classes/navigation/NavigationTreeTest.php
rename to test/classes/Navigation/NavigationTreeTest.php
index ae98737740..39f88c1f2a 100644
--- a/test/classes/navigation/NavigationTreeTest.php
+++ b/test/classes/Navigation/NavigationTreeTest.php
@@ -5,26 +5,27 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Navigation;
+
+use PhpMyAdmin\Config;
+use PhpMyAdmin\Navigation\NavigationTree;
+use PhpMyAdmin\Theme;
 
 /*
  * we must set $GLOBALS['server'] here
  * since 'check_user_privileges.inc.php' will use it globally
  */
-use PhpMyAdmin\Navigation\NavigationTree;
-use PhpMyAdmin\Theme;
-
 $GLOBALS['server'] = 0;
 $GLOBALS['cfg']['Server']['DisableIS'] = false;
 
 require_once 'libraries/check_user_privileges.inc.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * Tests for PhpMyAdmin\Navigation\NavigationTree class
  *
  * @package PhpMyAdmin-test
  */
-class NavigationTreeTest extends PMATestCase
+class NavigationTreeTest extends \PMATestCase
 {
     /**
      * @var NavigationTree
@@ -40,7 +41,7 @@ class NavigationTreeTest extends PMATestCase
     protected function setUp()
     {
         $GLOBALS['server'] = 1;
-        $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config();
+        $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['cfg']['Server']['host'] = 'localhost';
         $GLOBALS['cfg']['Server']['user'] = 'root';
@@ -52,7 +53,7 @@ class NavigationTreeTest extends PMATestCase
         $GLOBALS['pmaThemeImage'] = 'image';
         $GLOBALS['db'] = 'db';
 
-        $this->object = new PhpMyAdmin\Navigation\NavigationTree();
+        $this->object = new NavigationTree();
     }
 
     /**
diff --git a/test/classes/navigation/NodeFactoryTest.php b/test/classes/Navigation/NodeFactoryTest.php
similarity index 96%
rename from test/classes/navigation/NodeFactoryTest.php
rename to test/classes/Navigation/NodeFactoryTest.php
index 6034a35aa4..115c313a4e 100644
--- a/test/classes/navigation/NodeFactoryTest.php
+++ b/test/classes/Navigation/NodeFactoryTest.php
@@ -5,19 +5,18 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Navigation;
 
 use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Navigation\Nodes\Node;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for NodeFactory class
  *
  * @package PhpMyAdmin-test
  */
-class NodeFactoryTest extends PMATestCase
+class NodeFactoryTest extends \PMATestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/NodeColumnContainerTest.php b/test/classes/Navigation/Nodes/NodeColumnContainerTest.php
similarity index 90%
rename from test/classes/navigation/NodeColumnContainerTest.php
rename to test/classes/Navigation/Nodes/NodeColumnContainerTest.php
index bccc8299e9..1403df2a67 100644
--- a/test/classes/navigation/NodeColumnContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeColumnContainerTest.php
@@ -5,18 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Navigation\Nodes;
 
 use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Navigation\Nodes\NodeColumnContainer class
  *
  * @package PhpMyAdmin-test
  */
-class NodeColumnContainerTest extends PMATestCase
+class NodeColumnContainerTest extends \PMATestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/NodeColumnTest.php b/test/classes/Navigation/Nodes/NodeColumnTest.php
similarity index 90%
rename from test/classes/navigation/NodeColumnTest.php
rename to test/classes/Navigation/Nodes/NodeColumnTest.php
index 53b3d13a0d..00e2850050 100644
--- a/test/classes/navigation/NodeColumnTest.php
+++ b/test/classes/Navigation/Nodes/NodeColumnTest.php
@@ -5,18 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Navigation\Nodes;
 
 use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Navigation\Nodes\NodeColumn class
  *
  * @package PhpMyAdmin-test
  */
-class NodeColumnTest extends PMATestCase
+class NodeColumnTest extends \PMATestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/NodeDatabaseChildTest.php b/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php
similarity index 95%
rename from test/classes/navigation/NodeDatabaseChildTest.php
rename to test/classes/Navigation/Nodes/NodeDatabaseChildTest.php
index 2a60a25a5d..1934a80dc0 100644
--- a/test/classes/navigation/NodeDatabaseChildTest.php
+++ b/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php
@@ -5,20 +5,19 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Navigation\Nodes;
 
 use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Navigation\Nodes\NodeDatabaseChild;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Url;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Navigation\Nodes\NodeDatabaseChild class
  *
  * @package PhpMyAdmin-test
  */
-class NodeDatabaseChildTest extends PMATestCase
+class NodeDatabaseChildTest extends \PMATestCase
 {
     /**
      * @var NodeDatabaseChild
diff --git a/test/classes/navigation/NodeDatabaseTest.php b/test/classes/Navigation/Nodes/NodeDatabaseTest.php
similarity index 97%
rename from test/classes/navigation/NodeDatabaseTest.php
rename to test/classes/Navigation/Nodes/NodeDatabaseTest.php
index a6f285d8be..2ac18c5f03 100644
--- a/test/classes/navigation/NodeDatabaseTest.php
+++ b/test/classes/Navigation/Nodes/NodeDatabaseTest.php
@@ -5,18 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Navigation\Nodes;
 
 use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Navigation\Nodes\NodeDatabase class
  *
  * @package PhpMyAdmin-test
  */
-class NodeDatabaseTest extends PMATestCase
+class NodeDatabaseTest extends \PMATestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/NodeEventContainerTest.php b/test/classes/Navigation/Nodes/NodeEventContainerTest.php
similarity index 90%
rename from test/classes/navigation/NodeEventContainerTest.php
rename to test/classes/Navigation/Nodes/NodeEventContainerTest.php
index 2f228e252a..14703f21dc 100644
--- a/test/classes/navigation/NodeEventContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeEventContainerTest.php
@@ -5,18 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Navigation\Nodes;
 
 use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Navigation\Nodes\NodeEventContainer class
  *
  * @package PhpMyAdmin-test
  */
-class NodeEventContainerTest extends PMATestCase
+class NodeEventContainerTest extends \PMATestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/NodeEventTest.php b/test/classes/Navigation/Nodes/NodeEventTest.php
similarity index 90%
rename from test/classes/navigation/NodeEventTest.php
rename to test/classes/Navigation/Nodes/NodeEventTest.php
index 41e90d33b2..640166895d 100644
--- a/test/classes/navigation/NodeEventTest.php
+++ b/test/classes/Navigation/Nodes/NodeEventTest.php
@@ -5,18 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Navigation\Nodes;
 
 use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Navigation\Nodes\NodeEvent class
  *
  * @package PhpMyAdmin-test
  */
-class NodeEventTest extends PMATestCase
+class NodeEventTest extends \PMATestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/NodeFunctionContainerTest.php b/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php
similarity index 90%
rename from test/classes/navigation/NodeFunctionContainerTest.php
rename to test/classes/Navigation/Nodes/NodeFunctionContainerTest.php
index 32c3cffb28..7557d75378 100644
--- a/test/classes/navigation/NodeFunctionContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeFunctionContainerTest.php
@@ -5,18 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Navigation\Nodes;
 
 use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Navigation\Nodes\NodeFunctionContainer class
  *
  * @package PhpMyAdmin-test
  */
-class NodeFunctionContainerTest extends PMATestCase
+class NodeFunctionContainerTest extends \PMATestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/NodeFunctionTest.php b/test/classes/Navigation/Nodes/NodeFunctionTest.php
similarity index 90%
rename from test/classes/navigation/NodeFunctionTest.php
rename to test/classes/Navigation/Nodes/NodeFunctionTest.php
index 8450691196..6c1213ec99 100644
--- a/test/classes/navigation/NodeFunctionTest.php
+++ b/test/classes/Navigation/Nodes/NodeFunctionTest.php
@@ -5,18 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Navigation\Nodes;
 
 use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Navigation\Nodes\NodeFunction class
  *
  * @package PhpMyAdmin-test
  */
-class NodeFunctionTest extends PMATestCase
+class NodeFunctionTest extends \PMATestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/NodeIndexContainerTest.php b/test/classes/Navigation/Nodes/NodeIndexContainerTest.php
similarity index 90%
rename from test/classes/navigation/NodeIndexContainerTest.php
rename to test/classes/Navigation/Nodes/NodeIndexContainerTest.php
index 56ddbd7feb..fefa9fbeee 100644
--- a/test/classes/navigation/NodeIndexContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeIndexContainerTest.php
@@ -5,18 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Navigation\Nodes;
 
 use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Navigation\Nodes\NodeIndexContainer class
  *
  * @package PhpMyAdmin-test
  */
-class NodeIndexContainerTest extends PMATestCase
+class NodeIndexContainerTest extends \PMATestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/NodeIndexTest.php b/test/classes/Navigation/Nodes/NodeIndexTest.php
similarity index 90%
rename from test/classes/navigation/NodeIndexTest.php
rename to test/classes/Navigation/Nodes/NodeIndexTest.php
index 4d76aa669d..31f130e0c4 100644
--- a/test/classes/navigation/NodeIndexTest.php
+++ b/test/classes/Navigation/Nodes/NodeIndexTest.php
@@ -5,18 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Navigation\Nodes;
 
 use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Navigation\Nodes\NodeIndex class
  *
  * @package PhpMyAdmin-test
  */
-class NodeIndexTest extends PMATestCase
+class NodeIndexTest extends \PMATestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/NodeProcedureContainerTest.php b/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php
similarity index 90%
rename from test/classes/navigation/NodeProcedureContainerTest.php
rename to test/classes/Navigation/Nodes/NodeProcedureContainerTest.php
index b1ed475e98..090ea29a97 100644
--- a/test/classes/navigation/NodeProcedureContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeProcedureContainerTest.php
@@ -5,18 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Navigation\Nodes;
 
 use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Navigation\Nodes\NodeProcedureContainer class
  *
  * @package PhpMyAdmin-test
  */
-class NodeProcedureContainerTest extends PMATestCase
+class NodeProcedureContainerTest extends \PMATestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/NodeProcedureTest.php b/test/classes/Navigation/Nodes/NodeProcedureTest.php
similarity index 90%
rename from test/classes/navigation/NodeProcedureTest.php
rename to test/classes/Navigation/Nodes/NodeProcedureTest.php
index 2effaa418b..5a71634c02 100644
--- a/test/classes/navigation/NodeProcedureTest.php
+++ b/test/classes/Navigation/Nodes/NodeProcedureTest.php
@@ -5,18 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Navigation\Nodes;
 
 use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Navigation\Nodes\NodeProcedure class
  *
  * @package PhpMyAdmin-test
  */
-class NodeProcedureTest extends PMATestCase
+class NodeProcedureTest extends \PMATestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/NodeTableContainerTest.php b/test/classes/Navigation/Nodes/NodeTableContainerTest.php
similarity index 92%
rename from test/classes/navigation/NodeTableContainerTest.php
rename to test/classes/Navigation/Nodes/NodeTableContainerTest.php
index a562b67422..4be1b6cbce 100644
--- a/test/classes/navigation/NodeTableContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeTableContainerTest.php
@@ -5,18 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Navigation\Nodes;
 
 use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Navigation\Nodes\NodeTableContainer class
  *
  * @package PhpMyAdmin-test
  */
-class NodeTableContainerTest extends PMATestCase
+class NodeTableContainerTest extends \PMATestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/NodeTableTest.php b/test/classes/Navigation/Nodes/NodeTableTest.php
similarity index 96%
rename from test/classes/navigation/NodeTableTest.php
rename to test/classes/Navigation/Nodes/NodeTableTest.php
index 36749370f7..c6f188c7ff 100644
--- a/test/classes/navigation/NodeTableTest.php
+++ b/test/classes/Navigation/Nodes/NodeTableTest.php
@@ -5,18 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Navigation\Nodes;
 
 use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Navigation\Nodes\NodeTable class
  *
  * @package PhpMyAdmin-test
  */
-class NodeTableTest extends PMATestCase
+class NodeTableTest extends \PMATestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/NodeTest.php b/test/classes/Navigation/Nodes/NodeTest.php
similarity index 99%
rename from test/classes/navigation/NodeTest.php
rename to test/classes/Navigation/Nodes/NodeTest.php
index 26ef08da6f..c2794ae141 100644
--- a/test/classes/navigation/NodeTest.php
+++ b/test/classes/Navigation/Nodes/NodeTest.php
@@ -5,19 +5,19 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Navigation\Nodes;
 
 use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Navigation\Nodes\Node;
 use PhpMyAdmin\Theme;
-
-require_once 'test/PMATestCase.php';
+use ReflectionMethod;
 
 /**
  * Tests for Node class
  *
  * @package PhpMyAdmin-test
  */
-class NodeTest extends PMATestCase
+class NodeTest extends \PMATestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/NodeTriggerContainerTest.php b/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php
similarity index 90%
rename from test/classes/navigation/NodeTriggerContainerTest.php
rename to test/classes/Navigation/Nodes/NodeTriggerContainerTest.php
index 44d7b85552..29338f46c0 100644
--- a/test/classes/navigation/NodeTriggerContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeTriggerContainerTest.php
@@ -5,18 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Navigation\Nodes;
 
 use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Navigation\Nodes\NodeTrigger class
  *
  * @package PhpMyAdmin-test
  */
-class NodeTriggerContainerTest extends PMATestCase
+class NodeTriggerContainerTest extends \PMATestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/NodeTriggerTest.php b/test/classes/Navigation/Nodes/NodeTriggerTest.php
similarity index 90%
rename from test/classes/navigation/NodeTriggerTest.php
rename to test/classes/Navigation/Nodes/NodeTriggerTest.php
index 605128ba1d..65c06979f5 100644
--- a/test/classes/navigation/NodeTriggerTest.php
+++ b/test/classes/Navigation/Nodes/NodeTriggerTest.php
@@ -5,18 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Navigation\Nodes;
 
 use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Navigation\Nodes\NodeTrigger class
  *
  * @package PhpMyAdmin-test
  */
-class NodeTriggerTest extends PMATestCase
+class NodeTriggerTest extends \PMATestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/NodeViewContainerTest.php b/test/classes/Navigation/Nodes/NodeViewContainerTest.php
similarity index 92%
rename from test/classes/navigation/NodeViewContainerTest.php
rename to test/classes/Navigation/Nodes/NodeViewContainerTest.php
index a7af9198a3..caf51d41fc 100644
--- a/test/classes/navigation/NodeViewContainerTest.php
+++ b/test/classes/Navigation/Nodes/NodeViewContainerTest.php
@@ -5,18 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Navigation\Nodes;
 
 use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Navigation\Nodes\NodeViewContainer class
  *
  * @package PhpMyAdmin-test
  */
-class NodeViewContainerTest extends PMATestCase
+class NodeViewContainerTest extends \PMATestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/NodeViewTest.php b/test/classes/Navigation/Nodes/NodeViewTest.php
similarity index 91%
rename from test/classes/navigation/NodeViewTest.php
rename to test/classes/Navigation/Nodes/NodeViewTest.php
index 9967bbc8d8..6a9f39b51b 100644
--- a/test/classes/navigation/NodeViewTest.php
+++ b/test/classes/Navigation/Nodes/NodeViewTest.php
@@ -5,18 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Navigation\Nodes;
 
 use PhpMyAdmin\Navigation\NodeFactory;
 use PhpMyAdmin\Theme;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Navigation\Nodes\NodeView class
  *
  * @package PhpMyAdmin-test
  */
-class NodeViewTest extends PMATestCase
+class NodeViewTest extends \PMATestCase
 {
     /**
      * SetUp for test cases
@@ -28,7 +27,6 @@ class NodeViewTest extends PMATestCase
         $GLOBALS['server'] = 0;
     }
 
-
     /**
      * Test for __construct
      *
diff --git a/test/classes/NormalizationTest.php b/test/classes/NormalizationTest.php
index d0b0489cca..485cb65759 100644
--- a/test/classes/NormalizationTest.php
+++ b/test/classes/NormalizationTest.php
@@ -11,17 +11,17 @@ use PhpMyAdmin\Normalization;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\TypesMySQL;
 use PhpMyAdmin\Util;
+use PHPUnit_Framework_TestCase as TestCase;
 use stdClass;
 
 $GLOBALS['server'] = 1;
 
-
 /**
  * tests for PhpMyAdmin\Normalization
  *
  * @package PhpMyAdmin-test
  */
-class NormalizationTest extends \PHPUnit_Framework_TestCase
+class NormalizationTest extends TestCase
 {
     /**
      * prepares environment for tests
diff --git a/test/classes/OperationsTest.php b/test/classes/OperationsTest.php
index 419d5d2c72..1367de8d87 100644
--- a/test/classes/OperationsTest.php
+++ b/test/classes/OperationsTest.php
@@ -9,14 +9,14 @@ namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Operations;
 use PhpMyAdmin\Theme;
-
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * tests for operations
  *
  * @package PhpMyAdmin-test
  */
-class OperationsTest extends \PHPUnit_Framework_TestCase
+class OperationsTest extends TestCase
 {
     /**
      * Set up global environment.
diff --git a/test/classes/PDFTest.php b/test/classes/PdfTest.php
similarity index 95%
rename from test/classes/PDFTest.php
rename to test/classes/PdfTest.php
index 0aa3535ca1..271cd8d5c1 100644
--- a/test/classes/PDFTest.php
+++ b/test/classes/PdfTest.php
@@ -5,18 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Config;
 use PhpMyAdmin\Pdf;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * tests for Pdf class
  *
  * @package PhpMyAdmin-test
  */
-class PdfTest extends PMATestCase
+class PdfTest extends \PMATestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/plugin/auth/AuthenticationConfigTest.php b/test/classes/Plugins/Auth/AuthenticationConfigTest.php
similarity index 92%
rename from test/classes/plugin/auth/AuthenticationConfigTest.php
rename to test/classes/Plugins/Auth/AuthenticationConfigTest.php
index 32c3e8cfc8..dd8025bc13 100644
--- a/test/classes/plugin/auth/AuthenticationConfigTest.php
+++ b/test/classes/Plugins/Auth/AuthenticationConfigTest.php
@@ -5,18 +5,20 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Auth;
 
+use PhpMyAdmin\Config;
+use PhpMyAdmin\ErrorHandler;
 use PhpMyAdmin\Plugins\Auth\AuthenticationConfig;
 
 require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * tests for PhpMyAdmin\Plugins\Auth\AuthenticationConfig class
  *
  * @package PhpMyAdmin-test
  */
-class AuthenticationConfigTest extends PMATestCase
+class AuthenticationConfigTest extends \PMATestCase
 {
     protected $object;
 
@@ -27,7 +29,7 @@ class AuthenticationConfigTest extends PMATestCase
      */
     function setup()
     {
-        $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config();
+        $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['server'] = 0;
         $GLOBALS['token_provided'] = true;
@@ -89,7 +91,7 @@ class AuthenticationConfigTest extends PMATestCase
     public function testAuthFails()
     {
         $removeConstant = false;
-        $GLOBALS['error_handler'] = new PhpMyAdmin\ErrorHandler;
+        $GLOBALS['error_handler'] = new ErrorHandler;
         $GLOBALS['cfg']['Servers'] = array(1);
         $GLOBALS['allowDeny_forbidden'] = false;
         $GLOBALS['collation_connection'] = 'utf-8';
diff --git a/test/classes/plugin/auth/AuthenticationCookieTest.php b/test/classes/Plugins/Auth/AuthenticationCookieTest.php
similarity index 98%
rename from test/classes/plugin/auth/AuthenticationCookieTest.php
rename to test/classes/Plugins/Auth/AuthenticationCookieTest.php
index 64adcaa860..f72e2bf285 100644
--- a/test/classes/plugin/auth/AuthenticationCookieTest.php
+++ b/test/classes/Plugins/Auth/AuthenticationCookieTest.php
@@ -5,21 +5,24 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Auth;
 
+use PhpMyAdmin\Config;
+use PhpMyAdmin\ErrorHandler;
+use PhpMyAdmin\Footer;
+use PhpMyAdmin\Header;
 use PhpMyAdmin\Plugins\Auth\AuthenticationCookie;
 use PhpMyAdmin\Theme;
-
-$GLOBALS['PMA_Config'] = new PhpMyAdmin\Config();
+use ReflectionMethod;
 
 require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * tests for PhpMyAdmin\Plugins\Auth\AuthenticationCookie class
  *
  * @package PhpMyAdmin-test
  */
-class AuthenticationCookieTest extends PMATestCase
+class AuthenticationCookieTest extends \PMATestCase
 {
     /**
      * @var AuthenticationCookie
@@ -33,6 +36,7 @@ class AuthenticationCookieTest extends PMATestCase
      */
     function setup()
     {
+        $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['server'] = 0;
         $GLOBALS['text_dir'] = 'ltr';
@@ -273,12 +277,12 @@ class AuthenticationCookieTest extends PMATestCase
         $mockResponse->expects($this->once())
             ->method('getFooter')
             ->with()
-            ->will($this->returnValue(new PhpMyAdmin\Footer()));
+            ->will($this->returnValue(new Footer()));
 
         $mockResponse->expects($this->once())
             ->method('getHeader')
             ->with()
-            ->will($this->returnValue(new PhpMyAdmin\Header()));
+            ->will($this->returnValue(new Header()));
 
         $_REQUEST['old_usr'] = '';
         $GLOBALS['cfg']['LoginCookieRecall'] = false;
@@ -291,7 +295,7 @@ class AuthenticationCookieTest extends PMATestCase
         $GLOBALS['cfg']['CaptchaLoginPublicKey'] = 'testpubkey';
         $GLOBALS['server'] = 0;
 
-        $GLOBALS['error_handler'] = new PhpMyAdmin\ErrorHandler;
+        $GLOBALS['error_handler'] = new ErrorHandler;
 
         ob_start();
         $this->object->auth();
@@ -896,7 +900,7 @@ class AuthenticationCookieTest extends PMATestCase
      */
     public function testGetEncryptionSecretEmpty()
     {
-        $method = new \ReflectionMethod(
+        $method = new ReflectionMethod(
             'PhpMyAdmin\Plugins\Auth\AuthenticationCookie',
             '_getEncryptionSecret'
         );
@@ -925,7 +929,7 @@ class AuthenticationCookieTest extends PMATestCase
      */
     public function testGetEncryptionSecretConfigured()
     {
-        $method = new \ReflectionMethod(
+        $method = new ReflectionMethod(
             'PhpMyAdmin\Plugins\Auth\AuthenticationCookie',
             '_getEncryptionSecret'
         );
@@ -1084,7 +1088,7 @@ class AuthenticationCookieTest extends PMATestCase
             'password' => $newPassword,
             'server' => 'b 2'
         );
-        $method = new \ReflectionMethod(
+        $method = new ReflectionMethod(
             'PhpMyAdmin\Plugins\Auth\AuthenticationCookie',
             '_getSessionEncryptionSecret'
         );
diff --git a/test/classes/plugin/auth/AuthenticationHttpTest.php b/test/classes/Plugins/Auth/AuthenticationHttpTest.php
similarity index 98%
rename from test/classes/plugin/auth/AuthenticationHttpTest.php
rename to test/classes/Plugins/Auth/AuthenticationHttpTest.php
index 64237a6f08..1a3b29da3b 100644
--- a/test/classes/plugin/auth/AuthenticationHttpTest.php
+++ b/test/classes/Plugins/Auth/AuthenticationHttpTest.php
@@ -5,18 +5,19 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Auth;
 
+use PhpMyAdmin\Config;
 use PhpMyAdmin\Plugins\Auth\AuthenticationHttp;
 
 require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * tests for PhpMyAdmin\Plugins\Auth\AuthenticationHttp class
  *
  * @package PhpMyAdmin-test
  */
-class AuthenticationHttpTest extends PMATestCase
+class AuthenticationHttpTest extends \PMATestCase
 {
     /**
      * @var AuthenticationHttp
@@ -30,7 +31,7 @@ class AuthenticationHttpTest extends PMATestCase
      */
     function setup()
     {
-        $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config;
+        $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['cfg']['Servers'] = array();
         $GLOBALS['server'] = 0;
diff --git a/test/classes/plugin/auth/AuthenticationSignonTest.php b/test/classes/Plugins/Auth/AuthenticationSignonTest.php
similarity index 98%
rename from test/classes/plugin/auth/AuthenticationSignonTest.php
rename to test/classes/Plugins/Auth/AuthenticationSignonTest.php
index 5704045522..e499df742e 100644
--- a/test/classes/plugin/auth/AuthenticationSignonTest.php
+++ b/test/classes/Plugins/Auth/AuthenticationSignonTest.php
@@ -5,18 +5,19 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Auth;
 
+use PhpMyAdmin\Config;
 use PhpMyAdmin\Plugins\Auth\AuthenticationSignon;
 
 require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * tests for PhpMyAdmin\Plugins\Auth\AuthenticationSignon class
  *
  * @package PhpMyAdmin-test
  */
-class AuthenticationSignonTest extends PMATestCase
+class AuthenticationSignonTest extends \PMATestCase
 {
     protected $object;
 
@@ -27,7 +28,7 @@ class AuthenticationSignonTest extends PMATestCase
      */
     function setup()
     {
-        $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config;
+        $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['server'] = 0;
         $this->object = new AuthenticationSignon();
diff --git a/test/classes/plugin/export/ExportCodegenTest.php b/test/classes/Plugins/Export/ExportCodegenTest.php
similarity index 98%
rename from test/classes/plugin/export/ExportCodegenTest.php
rename to test/classes/Plugins/Export/ExportCodegenTest.php
index e65d43cf93..c6e9bc8e06 100644
--- a/test/classes/plugin/export/ExportCodegenTest.php
+++ b/test/classes/Plugins/Export/ExportCodegenTest.php
@@ -5,10 +5,14 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Export;
+
 use PhpMyAdmin\Plugins\Export\ExportCodegen;
+use ReflectionClass;
+use ReflectionMethod;
+use ReflectionProperty;
 
 require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * tests for PhpMyAdmin\Plugins\Export\ExportCodegen class
@@ -16,7 +20,7 @@ require_once 'test/PMATestCase.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class ExportCodegenTest extends PMATestCase
+class ExportCodegenTest extends \PMATestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/export/ExportCsvTest.php b/test/classes/Plugins/Export/ExportCsvTest.php
similarity index 97%
rename from test/classes/plugin/export/ExportCsvTest.php
rename to test/classes/Plugins/Export/ExportCsvTest.php
index 8d6a7f7659..124bf531c7 100644
--- a/test/classes/plugin/export/ExportCsvTest.php
+++ b/test/classes/Plugins/Export/ExportCsvTest.php
@@ -5,10 +5,14 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Export;
+
+use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Plugins\Export\ExportCsv;
+use ReflectionMethod;
+use ReflectionProperty;
 
 require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * tests for PhpMyAdmin\Plugins\Export\ExportCsv class
@@ -16,7 +20,7 @@ require_once 'test/PMATestCase.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class ExportCsvTest extends PMATestCase
+class ExportCsvTest extends \PMATestCase
 {
     protected $object;
 
@@ -504,7 +508,7 @@ class ExportCsvTest extends PMATestCase
 
         $dbi->expects($this->once())
             ->method('query')
-            ->with('test', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED)
+            ->with('test', null, DatabaseInterface::QUERY_UNBUFFERED)
             ->will($this->returnValue(true));
 
         $dbi->expects($this->once())
@@ -557,7 +561,7 @@ class ExportCsvTest extends PMATestCase
 
         $dbi->expects($this->once())
             ->method('query')
-            ->with('test', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED)
+            ->with('test', null, DatabaseInterface::QUERY_UNBUFFERED)
             ->will($this->returnValue(true));
 
         $dbi->expects($this->once())
@@ -604,7 +608,7 @@ class ExportCsvTest extends PMATestCase
 
         $dbi->expects($this->once())
             ->method('query')
-            ->with('test', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED)
+            ->with('test', null, DatabaseInterface::QUERY_UNBUFFERED)
             ->will($this->returnValue(true));
 
         $dbi->expects($this->once())
@@ -654,7 +658,7 @@ class ExportCsvTest extends PMATestCase
 
         $dbi->expects($this->once())
             ->method('query')
-            ->with('test', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED)
+            ->with('test', null, DatabaseInterface::QUERY_UNBUFFERED)
             ->will($this->returnValue(true));
 
         $dbi->expects($this->once())
@@ -703,7 +707,7 @@ class ExportCsvTest extends PMATestCase
 
         $dbi->expects($this->once())
             ->method('query')
-            ->with('test', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED)
+            ->with('test', null, DatabaseInterface::QUERY_UNBUFFERED)
             ->will($this->returnValue(true));
 
         $dbi->expects($this->once())
diff --git a/test/classes/plugin/export/ExportExcelTest.php b/test/classes/Plugins/Export/ExportExcelTest.php
similarity index 97%
rename from test/classes/plugin/export/ExportExcelTest.php
rename to test/classes/Plugins/Export/ExportExcelTest.php
index 9631659147..57a298b132 100644
--- a/test/classes/plugin/export/ExportExcelTest.php
+++ b/test/classes/Plugins/Export/ExportExcelTest.php
@@ -5,10 +5,13 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Export;
+
 use PhpMyAdmin\Plugins\Export\ExportExcel;
+use ReflectionMethod;
+use ReflectionProperty;
 
 require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * tests for PhpMyAdmin\Plugins\Export\ExportExcel class
@@ -16,7 +19,7 @@ require_once 'test/PMATestCase.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class ExportExcelTest extends PMATestCase
+class ExportExcelTest extends \PMATestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/export/ExportHtmlwordTest.php b/test/classes/Plugins/Export/ExportHtmlwordTest.php
similarity index 99%
rename from test/classes/plugin/export/ExportHtmlwordTest.php
rename to test/classes/Plugins/Export/ExportHtmlwordTest.php
index 6c67ddb819..652aa38bca 100644
--- a/test/classes/plugin/export/ExportHtmlwordTest.php
+++ b/test/classes/Plugins/Export/ExportHtmlwordTest.php
@@ -5,10 +5,14 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Export;
+
+use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Plugins\Export\ExportHtmlword;
+use ReflectionMethod;
+use ReflectionProperty;
 
 require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * tests for PhpMyAdmin\Plugins\Export\ExportHtmlword class
@@ -16,7 +20,7 @@ require_once 'test/PMATestCase.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class ExportHtmlwordTest extends PMATestCase
+class ExportHtmlwordTest extends \PMATestCase
 {
     protected $object;
 
@@ -336,7 +340,7 @@ class ExportHtmlwordTest extends PMATestCase
 
         $dbi->expects($this->once())
             ->method('query')
-            ->with('test', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED)
+            ->with('test', null, DatabaseInterface::QUERY_UNBUFFERED)
             ->will($this->returnValue(true));
 
         $dbi->expects($this->once())
diff --git a/test/classes/plugin/export/ExportJsonTest.php b/test/classes/Plugins/Export/ExportJsonTest.php
similarity index 97%
rename from test/classes/plugin/export/ExportJsonTest.php
rename to test/classes/Plugins/Export/ExportJsonTest.php
index af229edb79..74f4228222 100644
--- a/test/classes/plugin/export/ExportJsonTest.php
+++ b/test/classes/Plugins/Export/ExportJsonTest.php
@@ -5,10 +5,13 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Export;
+
 use PhpMyAdmin\Plugins\Export\ExportJson;
+use ReflectionMethod;
+use ReflectionProperty;
 
 require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * tests for PhpMyAdmin\Plugins\Export\ExportJson class
@@ -16,7 +19,7 @@ require_once 'test/PMATestCase.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class ExportJsonTest extends PMATestCase
+class ExportJsonTest extends \PMATestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/export/ExportLatexTest.php b/test/classes/Plugins/Export/ExportLatexTest.php
similarity index 99%
rename from test/classes/plugin/export/ExportLatexTest.php
rename to test/classes/Plugins/Export/ExportLatexTest.php
index 15af1321f1..f39f8b73ad 100644
--- a/test/classes/plugin/export/ExportLatexTest.php
+++ b/test/classes/Plugins/Export/ExportLatexTest.php
@@ -5,10 +5,13 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Export;
+
 use PhpMyAdmin\Plugins\Export\ExportLatex;
+use ReflectionMethod;
+use ReflectionProperty;
 
 require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * tests for PhpMyAdmin\Plugins\Export\ExportLatex class
@@ -16,7 +19,7 @@ require_once 'test/PMATestCase.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class ExportLatexTest extends PMATestCase
+class ExportLatexTest extends \PMATestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/export/ExportMediawikiTest.php b/test/classes/Plugins/Export/ExportMediawikiTest.php
similarity index 95%
rename from test/classes/plugin/export/ExportMediawikiTest.php
rename to test/classes/Plugins/Export/ExportMediawikiTest.php
index d7a7222266..224f5e47ee 100644
--- a/test/classes/plugin/export/ExportMediawikiTest.php
+++ b/test/classes/Plugins/Export/ExportMediawikiTest.php
@@ -5,10 +5,14 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Export;
+
+use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Plugins\Export\ExportMediawiki;
+use ReflectionMethod;
+use ReflectionProperty;
 
 require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * tests for PhpMyAdmin\Plugins\Export\ExportMediawiki class
@@ -16,7 +20,7 @@ require_once 'test/PMATestCase.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class ExportMediawikiTest extends PMATestCase
+class ExportMediawikiTest extends \PMATestCase
 {
     protected $object;
 
@@ -328,18 +332,6 @@ class ExportMediawikiTest extends PMATestCase
             "|}\n\n",
             $result
         );
-
-        /**
-         * This case produces an error, should it be tested?
-
-        ob_start();
-        $this->assertTrue(
-            $this->object->exportStructure(
-                'db', 'table', "\n", "example.com", "defaultTest", "test"
-            )
-        );
-        $result = ob_get_clean();
-        */
     }
     /**
      * Test for PhpMyAdmin\Plugins\Export\ExportMediawiki::exportData
@@ -359,7 +351,7 @@ class ExportMediawikiTest extends PMATestCase
 
         $dbi->expects($this->once())
             ->method('query')
-            ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED)
+            ->with('SELECT', null, DatabaseInterface::QUERY_UNBUFFERED)
             ->will($this->returnValue(true));
 
         $dbi->expects($this->once())
diff --git a/test/classes/plugin/export/ExportOdsTest.php b/test/classes/Plugins/Export/ExportOdsTest.php
similarity index 95%
rename from test/classes/plugin/export/ExportOdsTest.php
rename to test/classes/Plugins/Export/ExportOdsTest.php
index df17d1b3fc..beaf3904f0 100644
--- a/test/classes/plugin/export/ExportOdsTest.php
+++ b/test/classes/Plugins/Export/ExportOdsTest.php
@@ -5,10 +5,15 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Export;
+
+use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Plugins\Export\ExportOds;
+use ReflectionMethod;
+use ReflectionProperty;
+use stdClass;
 
 require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * tests for PhpMyAdmin\Plugins\Export\ExportOds class
@@ -16,7 +21,7 @@ require_once 'test/PMATestCase.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class ExportOdsTest extends PMATestCase
+class ExportOdsTest extends \PMATestCase
 {
     protected $object;
 
@@ -266,41 +271,41 @@ class ExportOdsTest extends PMATestCase
             ->getMock();
 
         $flags = array();
-        $a = new StdClass;
+        $a = new stdClass;
         $flags[] = $a;
 
-        $a = new StdClass;
+        $a = new stdClass;
         $a->blob = true;
         $flags[] = $a;
 
-        $a = new StdClass;
+        $a = new stdClass;
         $a->blob = false;
         $a->type = 'date';
         $flags[] = $a;
 
-        $a = new StdClass;
+        $a = new stdClass;
         $a->blob = false;
         $a->type = 'time';
         $flags[] = $a;
 
-        $a = new StdClass;
+        $a = new stdClass;
         $a->blob = false;
         $a->type = 'datetime';
         $flags[] = $a;
 
-        $a = new StdClass;
+        $a = new stdClass;
         $a->numeric = true;
         $a->type = 'none';
         $a->blob = false;
         $flags[] = $a;
 
-        $a = new StdClass;
+        $a = new stdClass;
         $a->numeric = true;
         $a->type = 'real';
         $a->blob = true;
         $flags[] = $a;
 
-        $a = new StdClass;
+        $a = new stdClass;
         $a->type = "dummy";
         $a->blob = false;
         $a->numeric = false;
@@ -326,7 +331,7 @@ class ExportOdsTest extends PMATestCase
 
         $dbi->expects($this->once())
             ->method('query')
-            ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED)
+            ->with('SELECT', null, DatabaseInterface::QUERY_UNBUFFERED)
             ->will($this->returnValue(true));
 
         $dbi->expects($this->once())
@@ -403,7 +408,7 @@ class ExportOdsTest extends PMATestCase
 
         $dbi->expects($this->once())
             ->method('query')
-            ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED)
+            ->with('SELECT', null, DatabaseInterface::QUERY_UNBUFFERED)
             ->will($this->returnValue(true));
 
         $dbi->expects($this->once())
@@ -464,7 +469,7 @@ class ExportOdsTest extends PMATestCase
 
         $dbi->expects($this->once())
             ->method('query')
-            ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED)
+            ->with('SELECT', null, DatabaseInterface::QUERY_UNBUFFERED)
             ->will($this->returnValue(true));
 
         $dbi->expects($this->once())
diff --git a/test/classes/plugin/export/ExportOdtTest.php b/test/classes/Plugins/Export/ExportOdtTest.php
similarity index 98%
rename from test/classes/plugin/export/ExportOdtTest.php
rename to test/classes/Plugins/Export/ExportOdtTest.php
index c8e5a5e6bd..602d56f9a1 100644
--- a/test/classes/plugin/export/ExportOdtTest.php
+++ b/test/classes/Plugins/Export/ExportOdtTest.php
@@ -5,10 +5,15 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Export;
+
+use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Plugins\Export\ExportOdt;
+use ReflectionMethod;
+use ReflectionProperty;
+use stdClass;
 
 require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * tests for PhpMyAdmin\Plugins\Export\ExportOdt class
@@ -16,7 +21,7 @@ require_once 'test/PMATestCase.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class ExportOdtTest extends PMATestCase
+class ExportOdtTest extends \PMATestCase
 {
     protected $object;
 
@@ -409,20 +414,20 @@ class ExportOdtTest extends PMATestCase
             ->getMock();
 
         $flags = array();
-        $a = new StdClass;
+        $a = new stdClass;
         $flags[] = $a;
 
-        $a = new StdClass;
+        $a = new stdClass;
         $a->blob = true;
         $flags[] = $a;
 
-        $a = new StdClass;
+        $a = new stdClass;
         $a->numeric = true;
         $a->type = 'real';
         $a->blob = false;
         $flags[] = $a;
 
-        $a = new StdClass;
+        $a = new stdClass;
         $a->type = "timestamp";
         $a->blob = false;
         $a->numeric = false;
@@ -443,7 +448,7 @@ class ExportOdtTest extends PMATestCase
 
         $dbi->expects($this->once())
             ->method('query')
-            ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED)
+            ->with('SELECT', null, DatabaseInterface::QUERY_UNBUFFERED)
             ->will($this->returnValue(true));
 
         $dbi->expects($this->once())
@@ -517,7 +522,7 @@ class ExportOdtTest extends PMATestCase
 
         $dbi->expects($this->once())
             ->method('query')
-            ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED)
+            ->with('SELECT', null, DatabaseInterface::QUERY_UNBUFFERED)
             ->will($this->returnValue(true));
 
         $dbi->expects($this->once())
@@ -578,7 +583,7 @@ class ExportOdtTest extends PMATestCase
 
         $dbi->expects($this->once())
             ->method('query')
-            ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED)
+            ->with('SELECT', null, DatabaseInterface::QUERY_UNBUFFERED)
             ->will($this->returnValue(true));
 
         $dbi->expects($this->once())
diff --git a/test/classes/plugin/export/ExportPdfTest.php b/test/classes/Plugins/Export/ExportPdfTest.php
similarity index 98%
rename from test/classes/plugin/export/ExportPdfTest.php
rename to test/classes/Plugins/Export/ExportPdfTest.php
index 3cbb1c03ff..7b8451c39e 100644
--- a/test/classes/plugin/export/ExportPdfTest.php
+++ b/test/classes/Plugins/Export/ExportPdfTest.php
@@ -5,11 +5,14 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Export;
+
 use PhpMyAdmin\Plugins\Export\ExportPdf;
 use PhpMyAdmin\Plugins\Export\Helpers\Pdf;
+use ReflectionMethod;
+use ReflectionProperty;
 
 require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * tests for PhpMyAdmin\Plugins\Export\ExportPdf class
@@ -17,7 +20,7 @@ require_once 'test/PMATestCase.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class ExportPdfTest extends PMATestCase
+class ExportPdfTest extends \PMATestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/export/ExportPhparrayTest.php b/test/classes/Plugins/Export/ExportPhparrayTest.php
similarity index 95%
rename from test/classes/plugin/export/ExportPhparrayTest.php
rename to test/classes/Plugins/Export/ExportPhparrayTest.php
index 0f15e96fde..e3b952fbf1 100644
--- a/test/classes/plugin/export/ExportPhparrayTest.php
+++ b/test/classes/Plugins/Export/ExportPhparrayTest.php
@@ -5,10 +5,14 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Export;
+
+use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Plugins\Export\ExportPhparray;
+use ReflectionMethod;
+use ReflectionProperty;
 
 require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * tests for PhpMyAdmin\Plugins\Export\ExportPhparray class
@@ -16,7 +20,7 @@ require_once 'test/PMATestCase.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class ExportPhparrayTest extends PMATestCase
+class ExportPhparrayTest extends \PMATestCase
 {
     protected $object;
 
@@ -212,7 +216,7 @@ class ExportPhparrayTest extends PMATestCase
 
         $dbi->expects($this->once())
             ->method('query')
-            ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED)
+            ->with('SELECT', null, DatabaseInterface::QUERY_UNBUFFERED)
             ->will($this->returnValue(true));
 
         $dbi->expects($this->once())
@@ -265,7 +269,7 @@ class ExportPhparrayTest extends PMATestCase
 
         $dbi->expects($this->once())
             ->method('query')
-            ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED)
+            ->with('SELECT', null, DatabaseInterface::QUERY_UNBUFFERED)
             ->will($this->returnValue(true));
 
         $dbi->expects($this->once())
diff --git a/test/classes/plugin/export/ExportSqlTest.php b/test/classes/Plugins/Export/ExportSqlTest.php
similarity index 99%
rename from test/classes/plugin/export/ExportSqlTest.php
rename to test/classes/Plugins/Export/ExportSqlTest.php
index dcd7317f32..f2a0b53458 100644
--- a/test/classes/plugin/export/ExportSqlTest.php
+++ b/test/classes/Plugins/Export/ExportSqlTest.php
@@ -5,11 +5,16 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Export;
+
+use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Plugins\Export\ExportSql;
 use PhpMyAdmin\Table;
+use ReflectionMethod;
+use ReflectionProperty;
+use stdClass;
 
 require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * tests for PhpMyAdmin\Plugins\Export\ExportSql class
@@ -17,7 +22,7 @@ require_once 'test/PMATestCase.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class ExportSqlTest extends PMATestCase
+class ExportSqlTest extends \PMATestCase
 {
     protected $object;
 
@@ -1424,7 +1429,7 @@ class ExportSqlTest extends PMATestCase
             ->getMock();
 
         $flags = array();
-        $a = new StdClass;
+        $a = new stdClass;
         $a->blob = false;
         $a->numeric = true;
         $a->type = 'ts';
@@ -1432,7 +1437,7 @@ class ExportSqlTest extends PMATestCase
         $a->length = 2;
         $flags[] = $a;
 
-        $a = new StdClass;
+        $a = new stdClass;
         $a->blob = false;
         $a->numeric = true;
         $a->type = 'ts';
@@ -1440,7 +1445,7 @@ class ExportSqlTest extends PMATestCase
         $a->length = 2;
         $flags[] = $a;
 
-        $a = new StdClass;
+        $a = new stdClass;
         $a->blob = true;
         $a->numeric = false;
         $a->type = 'ts';
@@ -1448,7 +1453,7 @@ class ExportSqlTest extends PMATestCase
         $a->length = 2;
         $flags[] = $a;
 
-        $a = new StdClass;
+        $a = new stdClass;
         $a->type = "bit";
         $a->blob = false;
         $a->numeric = false;
@@ -1456,7 +1461,7 @@ class ExportSqlTest extends PMATestCase
         $a->length = 2;
         $flags[] = $a;
 
-        $a = new StdClass;
+        $a = new stdClass;
         $a->blob = false;
         $a->numeric = true;
         $a->type = 'timestamp';
@@ -1478,7 +1483,7 @@ class ExportSqlTest extends PMATestCase
             ->with(
                 "SELECT a FROM b WHERE 1",
                 null,
-                PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED
+                DatabaseInterface::QUERY_UNBUFFERED
             )
             ->will($this->returnValue('res'));
 
@@ -1572,7 +1577,7 @@ class ExportSqlTest extends PMATestCase
             ->getMock();
 
         $flags = array();
-        $a = new StdClass;
+        $a = new stdClass;
         $a->blob = false;
         $a->numeric = true;
         $a->type = 'real';
@@ -1583,7 +1588,7 @@ class ExportSqlTest extends PMATestCase
         $a->primary_key = 1;
         $flags[] = $a;
 
-        $a = new StdClass;
+        $a = new stdClass;
         $a->blob = false;
         $a->numeric = true;
         $a->type = '';
@@ -1609,7 +1614,7 @@ class ExportSqlTest extends PMATestCase
             ->with(
                 "SELECT a FROM b WHERE 1",
                 null,
-                PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED
+                DatabaseInterface::QUERY_UNBUFFERED
             )
             ->will($this->returnValue('res'));
 
diff --git a/test/classes/plugin/export/ExportTexytextTest.php b/test/classes/Plugins/Export/ExportTexytextTest.php
similarity index 98%
rename from test/classes/plugin/export/ExportTexytextTest.php
rename to test/classes/Plugins/Export/ExportTexytextTest.php
index e80044b095..30ee258e2c 100644
--- a/test/classes/plugin/export/ExportTexytextTest.php
+++ b/test/classes/Plugins/Export/ExportTexytextTest.php
@@ -5,10 +5,14 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Export;
+
+use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Plugins\Export\ExportTexytext;
+use ReflectionMethod;
+use ReflectionProperty;
 
 require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * tests for PhpMyAdmin\Plugins\Export\ExportTexytext class
@@ -16,7 +20,7 @@ require_once 'test/PMATestCase.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class ExportTexytextTest extends PMATestCase
+class ExportTexytextTest extends \PMATestCase
 {
     protected $object;
 
@@ -239,7 +243,7 @@ class ExportTexytextTest extends PMATestCase
 
         $dbi->expects($this->once())
             ->method('query')
-            ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED)
+            ->with('SELECT', null, DatabaseInterface::QUERY_UNBUFFERED)
             ->will($this->returnValue(true));
 
         $dbi->expects($this->once())
diff --git a/test/classes/plugin/export/ExportXmlTest.php b/test/classes/Plugins/Export/ExportXmlTest.php
similarity index 98%
rename from test/classes/plugin/export/ExportXmlTest.php
rename to test/classes/Plugins/Export/ExportXmlTest.php
index 232c1c47d0..5a01405429 100644
--- a/test/classes/plugin/export/ExportXmlTest.php
+++ b/test/classes/Plugins/Export/ExportXmlTest.php
@@ -5,13 +5,15 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Export;
+
+use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Plugins\Export\ExportXml;
 use PhpMyAdmin\Table;
-
-$GLOBALS['db'] = 'db';
+use ReflectionMethod;
+use ReflectionProperty;
 
 require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * tests for PhpMyAdmin\Plugins\Export\ExportXml class
@@ -19,7 +21,7 @@ require_once 'test/PMATestCase.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class ExportXmlTest extends PMATestCase
+class ExportXmlTest extends \PMATestCase
 {
     protected $object;
 
@@ -489,7 +491,7 @@ class ExportXmlTest extends PMATestCase
 
         $dbi->expects($this->once())
             ->method('query')
-            ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED)
+            ->with('SELECT', null, DatabaseInterface::QUERY_UNBUFFERED)
             ->will($this->returnValue(true));
 
         $dbi->expects($this->once())
diff --git a/test/classes/plugin/export/ExportYamlTest.php b/test/classes/Plugins/Export/ExportYamlTest.php
similarity index 96%
rename from test/classes/plugin/export/ExportYamlTest.php
rename to test/classes/Plugins/Export/ExportYamlTest.php
index 224ff3890c..fe95db3b00 100644
--- a/test/classes/plugin/export/ExportYamlTest.php
+++ b/test/classes/Plugins/Export/ExportYamlTest.php
@@ -5,10 +5,14 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Export;
+
+use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Plugins\Export\ExportYaml;
+use ReflectionMethod;
+use ReflectionProperty;
 
 require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * tests for PhpMyAdmin\Plugins\Export\ExportYaml class
@@ -16,7 +20,7 @@ require_once 'test/PMATestCase.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class ExportYamlTest extends PMATestCase
+class ExportYamlTest extends \PMATestCase
 {
     protected $object;
 
@@ -201,7 +205,7 @@ class ExportYamlTest extends PMATestCase
 
         $dbi->expects($this->once())
             ->method('query')
-            ->with('SELECT', null, PhpMyAdmin\DatabaseInterface::QUERY_UNBUFFERED)
+            ->with('SELECT', null, DatabaseInterface::QUERY_UNBUFFERED)
             ->will($this->returnValue(true));
 
         $dbi->expects($this->once())
diff --git a/test/classes/plugin/export/helpers/TablePropertyTest.php b/test/classes/Plugins/Export/Helpers/TablePropertyTest.php
similarity index 98%
rename from test/classes/plugin/export/helpers/TablePropertyTest.php
rename to test/classes/Plugins/Export/Helpers/TablePropertyTest.php
index f447934b4d..a5fe4e4f28 100644
--- a/test/classes/plugin/export/helpers/TablePropertyTest.php
+++ b/test/classes/Plugins/Export/Helpers/TablePropertyTest.php
@@ -5,17 +5,18 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Export\Helpers;
+
 use PhpMyAdmin\Plugins\Export\Helpers\TableProperty;
 
 require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * tests for PhpMyAdmin\Plugins\Export\Helpers\TableProperty class
  *
  * @package PhpMyAdmin-test
  */
-class TablePropertyTest extends PMATestCase
+class TablePropertyTest extends \PMATestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/import/ImportCsvTest.php b/test/classes/Plugins/Import/ImportCsvTest.php
similarity index 97%
rename from test/classes/plugin/import/ImportCsvTest.php
rename to test/classes/Plugins/Import/ImportCsvTest.php
index 93440abdf8..fc04b9b5b9 100644
--- a/test/classes/plugin/import/ImportCsvTest.php
+++ b/test/classes/Plugins/Import/ImportCsvTest.php
@@ -4,28 +4,24 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Import;
 
-/*
+use PhpMyAdmin\File;
+use PhpMyAdmin\Plugins\Import\ImportCsv;
+use PhpMyAdmin\Theme;
+
+/**
  * we must set $GLOBALS['server'] here
  * since 'check_user_privileges.inc.php' will use it globally
  */
-use PhpMyAdmin\Plugins\Import\ImportCsv;
-use PhpMyAdmin\Theme;
-use PhpMyAdmin\File;
-
 $GLOBALS['server'] = 0;
 
-/*
- * Include to test.
- */
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Plugins\Import\ImportCsv class
  *
  * @package PhpMyAdmin-test
  */
-class ImportCsvTest extends PMATestCase
+class ImportCsvTest extends \PMATestCase
 {
     /**
      * @var ImportCsv
diff --git a/test/classes/plugin/import/ImportLdiTest.php b/test/classes/Plugins/Import/ImportLdiTest.php
similarity index 98%
rename from test/classes/plugin/import/ImportLdiTest.php
rename to test/classes/Plugins/Import/ImportLdiTest.php
index 3f91c0cbbc..d6542f66a6 100644
--- a/test/classes/plugin/import/ImportLdiTest.php
+++ b/test/classes/Plugins/Import/ImportLdiTest.php
@@ -4,28 +4,24 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Import;
+
+use PhpMyAdmin\File;
+use PhpMyAdmin\Plugins\Import\ImportLdi;
 
 /*
  * we must set $GLOBALS['server'] here
  * since 'check_user_privileges.inc.php' will use it globally
  */
-use PhpMyAdmin\Plugins\Import\ImportLdi;
-use PhpMyAdmin\File;
-
 $GLOBALS['server'] = 0;
 $GLOBALS['plugin_param'] = "table";
 
-/*
- * Include to test.
- */
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Plugins\Import\ImportLdi class
  *
  * @package PhpMyAdmin-test
  */
-class ImportLdiTest extends PMATestCase
+class ImportLdiTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/plugin/import/ImportMediawikiTest.php b/test/classes/Plugins/Import/ImportMediawikiTest.php
similarity index 97%
rename from test/classes/plugin/import/ImportMediawikiTest.php
rename to test/classes/Plugins/Import/ImportMediawikiTest.php
index 6b6bd20ded..2e9d545c4b 100644
--- a/test/classes/plugin/import/ImportMediawikiTest.php
+++ b/test/classes/Plugins/Import/ImportMediawikiTest.php
@@ -4,26 +4,23 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Import;
+
+use PhpMyAdmin\File;
+use PhpMyAdmin\Plugins\Import\ImportMediawiki;
+
 /*
  * we must set $GLOBALS['server'] here
  * since 'check_user_privileges.inc.php' will use it globally
  */
-use PhpMyAdmin\Plugins\Import\ImportMediawiki;
-use PhpMyAdmin\File;
-
 $GLOBALS['server'] = 0;
 
-/*
- * Include to test.
- */
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Plugins\Import\ImportMediawiki class
  *
  * @package PhpMyAdmin-test
  */
-class ImportMediawikiTest extends PMATestCase
+class ImportMediawikiTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/plugin/import/ImportOdsTest.php b/test/classes/Plugins/Import/ImportOdsTest.php
similarity index 97%
rename from test/classes/plugin/import/ImportOdsTest.php
rename to test/classes/Plugins/Import/ImportOdsTest.php
index 31dc465c1f..9007ca4d14 100644
--- a/test/classes/plugin/import/ImportOdsTest.php
+++ b/test/classes/Plugins/Import/ImportOdsTest.php
@@ -4,27 +4,23 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Import;
+
+use PhpMyAdmin\File;
+use PhpMyAdmin\Plugins\Import\ImportOds;
 
 /*
  * we must set $GLOBALS['server'] here
  * since 'check_user_privileges.inc.php' will use it globally
  */
-use PhpMyAdmin\Plugins\Import\ImportOds;
-use PhpMyAdmin\File;
-
 $GLOBALS['server'] = 0;
 
-/*
- * Include to test.
- */
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Plugins\Import\ImportOds class
  *
  * @package PhpMyAdmin-test
  */
-class ImportOdsTest extends PMATestCase
+class ImportOdsTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/plugin/import/ImportShpTest.php b/test/classes/Plugins/Import/ImportShpTest.php
similarity index 98%
rename from test/classes/plugin/import/ImportShpTest.php
rename to test/classes/Plugins/Import/ImportShpTest.php
index f47bd27802..5e5a0833de 100644
--- a/test/classes/plugin/import/ImportShpTest.php
+++ b/test/classes/Plugins/Import/ImportShpTest.php
@@ -4,24 +4,23 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Import;
+
+use PhpMyAdmin\File;
+use PhpMyAdmin\Plugins\Import\ImportShp;
 
 /*
  * we must set $GLOBALS['server'] here
  * since 'check_user_privileges.inc.php' will use it globally
  */
-use PhpMyAdmin\Plugins\Import\ImportShp;
-use PhpMyAdmin\File;
-
 $GLOBALS['server'] = 0;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Plugins\Import\ImportShp class
  *
  * @package PhpMyAdmin-test
  */
-class ImportShpTest extends PMATestCase
+class ImportShpTest extends \PMATestCase
 {
     /**
      * @var ImportShp
diff --git a/test/classes/plugin/import/ImportSqlTest.php b/test/classes/Plugins/Import/ImportSqlTest.php
similarity index 96%
rename from test/classes/plugin/import/ImportSqlTest.php
rename to test/classes/Plugins/Import/ImportSqlTest.php
index 61f470188a..c9eb883029 100644
--- a/test/classes/plugin/import/ImportSqlTest.php
+++ b/test/classes/Plugins/Import/ImportSqlTest.php
@@ -4,27 +4,23 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Import;
+
+use PhpMyAdmin\File;
+use PhpMyAdmin\Plugins\Import\ImportSql;
 
 /*
  * we must set $GLOBALS['server'] here
  * since 'check_user_privileges.inc.php' will use it globally
  */
-use PhpMyAdmin\Plugins\Import\ImportSql;
-use PhpMyAdmin\File;
-
 $GLOBALS['server'] = 0;
 
-/*
- * Include to test.
- */
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Plugins\Import\ImportSql class
  *
  * @package PhpMyAdmin-test
  */
-class ImportSqlTest extends PMATestCase
+class ImportSqlTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/plugin/import/ImportXmlTest.php b/test/classes/Plugins/Import/ImportXmlTest.php
similarity index 97%
rename from test/classes/plugin/import/ImportXmlTest.php
rename to test/classes/Plugins/Import/ImportXmlTest.php
index 82323a0ccc..536e4146d5 100644
--- a/test/classes/plugin/import/ImportXmlTest.php
+++ b/test/classes/Plugins/Import/ImportXmlTest.php
@@ -4,27 +4,23 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Import;
+
+use PhpMyAdmin\File;
+use PhpMyAdmin\Plugins\Import\ImportXml;
 
 /*
  * we must set $GLOBALS['server'] here
  * since 'check_user_privileges.inc.php' will use it globally
  */
-use PhpMyAdmin\Plugins\Import\ImportXml;
-use PhpMyAdmin\File;
-
 $GLOBALS['server'] = 0;
 
-/*
- * Include to test.
- */
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Plugins\Import\ImportXml class
  *
  * @package PhpMyAdmin-test
  */
-class ImportXmlTest extends PMATestCase
+class ImportXmlTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/schema/DiaRelationSchemaTest.php b/test/classes/Plugins/Schema/DiaRelationSchemaTest.php
similarity index 97%
rename from test/classes/schema/DiaRelationSchemaTest.php
rename to test/classes/Plugins/Schema/DiaRelationSchemaTest.php
index 18114be587..27d0a69214 100644
--- a/test/classes/schema/DiaRelationSchemaTest.php
+++ b/test/classes/Plugins/Schema/DiaRelationSchemaTest.php
@@ -4,21 +4,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Schema;
 
-/*
- * Include to test.
- */
 use PhpMyAdmin\Plugins\Schema\Dia\DiaRelationSchema;
 use PhpMyAdmin\Relation;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Plugins\Schema\Dia\DiaRelationSchema class
  *
  * @package PhpMyAdmin-test
  */
-class DiaRelationSchemaTest extends PMATestCase
+class DiaRelationSchemaTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/schema/EpsRelationSchemaTest.php b/test/classes/Plugins/Schema/EpsRelationSchemaTest.php
similarity index 97%
rename from test/classes/schema/EpsRelationSchemaTest.php
rename to test/classes/Plugins/Schema/EpsRelationSchemaTest.php
index d9c6454a7a..226ed111f0 100644
--- a/test/classes/schema/EpsRelationSchemaTest.php
+++ b/test/classes/Plugins/Schema/EpsRelationSchemaTest.php
@@ -4,21 +4,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Schema;
 
-/*
- * Include to test.
- */
 use PhpMyAdmin\Plugins\Schema\Eps\EpsRelationSchema;
 use PhpMyAdmin\Relation;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for EpsRelationSchema class
  *
  * @package PhpMyAdmin-test
  */
-class EpsRelationSchemaTest extends PMATestCase
+class EpsRelationSchemaTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/schema/ExportRelationSchemaTest.php b/test/classes/Plugins/Schema/ExportRelationSchemaTest.php
similarity index 97%
rename from test/classes/schema/ExportRelationSchemaTest.php
rename to test/classes/Plugins/Schema/ExportRelationSchemaTest.php
index cdf64a1243..658609e6fe 100644
--- a/test/classes/schema/ExportRelationSchemaTest.php
+++ b/test/classes/Plugins/Schema/ExportRelationSchemaTest.php
@@ -4,21 +4,16 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
+namespace PhpMyAdmin\Tests\Plugins\Schema;
 
 use PhpMyAdmin\Plugins\Schema\ExportRelationSchema;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Plugins\Schema\ExportRelationSchema class
  *
  * @package PhpMyAdmin-test
  */
-class ExportRelationSchemaTest extends PMATestCase
+class ExportRelationSchemaTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/schema/PdfRelationSchemaTest.php b/test/classes/Plugins/Schema/PdfRelationSchemaTest.php
similarity index 98%
rename from test/classes/schema/PdfRelationSchemaTest.php
rename to test/classes/Plugins/Schema/PdfRelationSchemaTest.php
index d55719ddc8..b12a1ef168 100644
--- a/test/classes/schema/PdfRelationSchemaTest.php
+++ b/test/classes/Plugins/Schema/PdfRelationSchemaTest.php
@@ -4,21 +4,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Schema;
 
-/*
- * Include to test.
- */
 use PhpMyAdmin\Plugins\Schema\Pdf\PdfRelationSchema;
 use PhpMyAdmin\Relation;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PdfRelationSchema class
  *
  * @package PhpMyAdmin-test
  */
-class PdfRelationSchemaTest extends PMATestCase
+class PdfRelationSchemaTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/schema/SvgRelationSchemaTest.php b/test/classes/Plugins/Schema/SvgRelationSchemaTest.php
similarity index 97%
rename from test/classes/schema/SvgRelationSchemaTest.php
rename to test/classes/Plugins/Schema/SvgRelationSchemaTest.php
index 9e4ddf0a0f..36e7a83a23 100644
--- a/test/classes/schema/SvgRelationSchemaTest.php
+++ b/test/classes/Plugins/Schema/SvgRelationSchemaTest.php
@@ -4,21 +4,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Schema;
 
-/*
- * Include to test.
- */
 use PhpMyAdmin\Plugins\Schema\Svg\SvgRelationSchema;
 use PhpMyAdmin\Relation;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Plugins\Schema\Svg\SvgRelationSchema class
  *
  * @package PhpMyAdmin-test
  */
-class SvgRelationSchemaTest extends PMATestCase
+class SvgRelationSchemaTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/plugin/transformations/TransformationPluginsTest.php b/test/classes/Plugins/Transformations/TransformationPluginsTest.php
similarity index 99%
rename from test/classes/plugin/transformations/TransformationPluginsTest.php
rename to test/classes/Plugins/Transformations/TransformationPluginsTest.php
index 568a65e594..142fe288bd 100644
--- a/test/classes/plugin/transformations/TransformationPluginsTest.php
+++ b/test/classes/Plugins/Transformations/TransformationPluginsTest.php
@@ -4,7 +4,9 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Plugins\Transformations;
 
+use PhpMyAdmin\Config;
 use PhpMyAdmin\Plugins\Transformations\Input\Image_JPEG_Upload;
 use PhpMyAdmin\Plugins\Transformations\Input\Text_Plain_RegexValidation;
 use PhpMyAdmin\Plugins\Transformations\Input\Text_Plain_FileUpload;
@@ -22,19 +24,19 @@ use PhpMyAdmin\Plugins\Transformations\Text_Plain_Link;
 use PhpMyAdmin\Plugins\Transformations\Text_Plain_Longtoipv4;
 use PhpMyAdmin\Plugins\Transformations\Text_Plain_PreApPend;
 use PhpMyAdmin\Plugins\Transformations\Text_Plain_Substring;
+use ReflectionMethod;
 
 /*
  * Include to test.
  */
 require_once 'libraries/config.default.php';
-require_once 'test/PMATestCase.php';
 
 /**
  * Tests for different input/output transformation plugins
  *
  * @package PhpMyAdmin-test
  */
-class TransformationPluginsTest extends PMATestCase
+class TransformationPluginsTest extends \PMATestCase
 {
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -51,7 +53,7 @@ class TransformationPluginsTest extends PMATestCase
         $row = array("pma"=>"aaa", "pca"=>"bbb");
 
         // For Image_*_Inline plugin
-        $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config();
+        $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['PMA_Config']->enableBc();
 
         // For Date Format plugin
diff --git a/test/classes/properties/options/groups/OptionsPropertyMainGroupTest.php b/test/classes/Properties/Options/Groups/OptionsPropertyMainGroupTest.php
similarity index 86%
rename from test/classes/properties/options/groups/OptionsPropertyMainGroupTest.php
rename to test/classes/Properties/Options/Groups/OptionsPropertyMainGroupTest.php
index ad7e682550..e20d24cff8 100644
--- a/test/classes/properties/options/groups/OptionsPropertyMainGroupTest.php
+++ b/test/classes/Properties/Options/Groups/OptionsPropertyMainGroupTest.php
@@ -5,15 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Properties\Options\Groups;
 
 use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * tests for PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup class
  *
  * @package PhpMyAdmin-test
  */
-class OptionsPropertyMainGroupTest extends PHPUnit_Framework_TestCase
+class OptionsPropertyMainGroupTest extends TestCase
 {
     protected $object;
 
diff --git a/test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php b/test/classes/Properties/Options/Groups/OptionsPropertyRootGroupTest.php
similarity index 89%
rename from test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php
rename to test/classes/Properties/Options/Groups/OptionsPropertyRootGroupTest.php
index e5402f296b..4f2ba41c8d 100644
--- a/test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php
+++ b/test/classes/Properties/Options/Groups/OptionsPropertyRootGroupTest.php
@@ -5,15 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Properties\Options\Groups;
 
 use PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * tests for PhpMyAdmin\Properties\Options\Groups\OptionsPropertyRootGroup class
  *
  * @package PhpMyAdmin-test
  */
-class OptionsPropertyRootGroupTest extends PHPUnit_Framework_TestCase
+class OptionsPropertyRootGroupTest extends TestCase
 {
     protected $object;
 
diff --git a/test/classes/properties/options/groups/OptionsPropertySubgroupTest.php b/test/classes/Properties/Options/Groups/OptionsPropertySubgroupTest.php
similarity index 90%
rename from test/classes/properties/options/groups/OptionsPropertySubgroupTest.php
rename to test/classes/Properties/Options/Groups/OptionsPropertySubgroupTest.php
index 4c3db9d8d2..e55cf1ecab 100644
--- a/test/classes/properties/options/groups/OptionsPropertySubgroupTest.php
+++ b/test/classes/Properties/Options/Groups/OptionsPropertySubgroupTest.php
@@ -5,15 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Properties\Options\Groups;
 
 use PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * tests for PhpMyAdmin\Properties\Options\Groups\OptionsPropertySubgroup class
  *
  * @package PhpMyAdmin-test
  */
-class OptionsPropertySubgroupTest extends PHPUnit_Framework_TestCase
+class OptionsPropertySubgroupTest extends TestCase
 {
     protected $object;
 
diff --git a/test/classes/properties/options/items/PropertyItemsTest.php b/test/classes/Properties/Options/Items/PropertyItemsTest.php
similarity index 96%
rename from test/classes/properties/options/items/PropertyItemsTest.php
rename to test/classes/Properties/Options/Items/PropertyItemsTest.php
index f1dce1ffa2..10daf6b02a 100644
--- a/test/classes/properties/options/items/PropertyItemsTest.php
+++ b/test/classes/Properties/Options/Items/PropertyItemsTest.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Properties\Options\Items;
 
 use PhpMyAdmin\Properties\Options\Items\BoolPropertyItem;
 use PhpMyAdmin\Properties\Options\Items\DocPropertyItem;
@@ -13,13 +14,14 @@ use PhpMyAdmin\Properties\Options\Items\MessageOnlyPropertyItem;
 use PhpMyAdmin\Properties\Options\Items\RadioPropertyItem;
 use PhpMyAdmin\Properties\Options\Items\SelectPropertyItem;
 use PhpMyAdmin\Properties\Options\Items\TextPropertyItem;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * tests for *PhpMyAdmin\Properties\PropertyItem class
  *
  * @package PhpMyAdmin-test
  */
-class PropertyItemsTest extends PHPUnit_Framework_TestCase
+class PropertyItemsTest extends TestCase
 {
     /**
      * Test for PhpMyAdmin\Properties\Options\Items\BoolPropertyItem::getText
@@ -169,6 +171,4 @@ class PropertyItemsTest extends PHPUnit_Framework_TestCase
             $object->getItemType()
         );
     }
-
-
 }
diff --git a/test/classes/properties/options/OptionsPropertyGroupTest.php b/test/classes/Properties/Options/OptionsPropertyGroupTest.php
similarity index 81%
rename from test/classes/properties/options/OptionsPropertyGroupTest.php
rename to test/classes/Properties/Options/OptionsPropertyGroupTest.php
index 217b650200..7ce68ae281 100644
--- a/test/classes/properties/options/OptionsPropertyGroupTest.php
+++ b/test/classes/Properties/Options/OptionsPropertyGroupTest.php
@@ -5,13 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Properties\Options;
+
+use PHPUnit_Framework_TestCase as TestCase;
+use ReflectionProperty;
 
 /**
  * Tests for PhpMyAdmin\Properties\Options\OptionsPropertyGroup class
  *
  * @package PhpMyAdmin-test
  */
-class OptionsPropertyGroupTest extends PHPUnit_Framework_TestCase
+class OptionsPropertyGroupTest extends TestCase
 {
     protected $stub;
 
@@ -42,7 +46,7 @@ class OptionsPropertyGroupTest extends PHPUnit_Framework_TestCase
      */
     public function testAddProperty()
     {
-        $properties = new \ReflectionProperty('PhpMyAdmin\Properties\Options\OptionsPropertyGroup', '_properties');
+        $properties = new ReflectionProperty('PhpMyAdmin\Properties\Options\OptionsPropertyGroup', '_properties');
         $properties->setAccessible(true);
 
         $properties->setValue($this->stub, array(1, 2, 3));
@@ -66,7 +70,7 @@ class OptionsPropertyGroupTest extends PHPUnit_Framework_TestCase
      */
     public function testRemoveProperty()
     {
-        $properties = new \ReflectionProperty('PhpMyAdmin\Properties\Options\OptionsPropertyGroup', '_properties');
+        $properties = new ReflectionProperty('PhpMyAdmin\Properties\Options\OptionsPropertyGroup', '_properties');
         $properties->setAccessible(true);
 
         $properties->setValue($this->stub, array(1, 2, 'test', 3));
@@ -102,7 +106,7 @@ class OptionsPropertyGroupTest extends PHPUnit_Framework_TestCase
      */
     public function testGetProperties()
     {
-        $properties = new \ReflectionProperty('PhpMyAdmin\Properties\Options\OptionsPropertyGroup', '_properties');
+        $properties = new ReflectionProperty('PhpMyAdmin\Properties\Options\OptionsPropertyGroup', '_properties');
         $properties->setAccessible(true);
         $properties->setValue($this->stub, array(1, 2, 3));
 
@@ -119,7 +123,7 @@ class OptionsPropertyGroupTest extends PHPUnit_Framework_TestCase
      */
     public function testGetNrOfProperties()
     {
-        $properties = new \ReflectionProperty('PhpMyAdmin\Properties\Options\OptionsPropertyGroup', '_properties');
+        $properties = new ReflectionProperty('PhpMyAdmin\Properties\Options\OptionsPropertyGroup', '_properties');
         $properties->setAccessible(true);
         $properties->setValue($this->stub, array(1, 2, 3));
 
diff --git a/test/classes/properties/options/OptionsPropertyItemTest.php b/test/classes/Properties/Options/OptionsPropertyItemTest.php
similarity index 93%
rename from test/classes/properties/options/OptionsPropertyItemTest.php
rename to test/classes/Properties/Options/OptionsPropertyItemTest.php
index af5e801e9b..c0cdc3eed9 100644
--- a/test/classes/properties/options/OptionsPropertyItemTest.php
+++ b/test/classes/Properties/Options/OptionsPropertyItemTest.php
@@ -5,13 +5,16 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Properties\Options;
+
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * Tests for PhpMyAdmin\Properties\Options\OptionsPropertyItem class
  *
  * @package PhpMyAdmin-test
  */
-class OptionsPropertyItemTest extends PHPUnit_Framework_TestCase
+class OptionsPropertyItemTest extends TestCase
 {
     protected $stub;
 
diff --git a/test/classes/properties/options/OptionsPropertyOneItemTest.php b/test/classes/Properties/Options/OptionsPropertyOneItemTest.php
similarity index 94%
rename from test/classes/properties/options/OptionsPropertyOneItemTest.php
rename to test/classes/Properties/Options/OptionsPropertyOneItemTest.php
index f430e00350..cbc41788a1 100644
--- a/test/classes/properties/options/OptionsPropertyOneItemTest.php
+++ b/test/classes/Properties/Options/OptionsPropertyOneItemTest.php
@@ -5,13 +5,16 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Properties\Options;
+
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * Tests for PhpMyAdmin\Properties\Options\OptionsPropertyOneItem class
  *
  * @package PhpMyAdmin-test
  */
-class OptionsPropertyOneItemTest extends PHPUnit_Framework_TestCase
+class OptionsPropertyOneItemTest extends TestCase
 {
     protected $stub;
 
diff --git a/test/classes/properties/plugins/ExportPluginPropertiesTest.php b/test/classes/Properties/Plugins/ExportPluginPropertiesTest.php
similarity index 93%
rename from test/classes/properties/plugins/ExportPluginPropertiesTest.php
rename to test/classes/Properties/Plugins/ExportPluginPropertiesTest.php
index 1a456699fe..d3a1610b61 100644
--- a/test/classes/properties/plugins/ExportPluginPropertiesTest.php
+++ b/test/classes/Properties/Plugins/ExportPluginPropertiesTest.php
@@ -5,10 +5,10 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Properties\Plugins;
 
 use PhpMyAdmin\Properties\Plugins\ExportPluginProperties;
-
-require_once 'test/classes/properties/plugins/ImportPluginPropertiesTest.php';
+use PhpMyAdmin\Tests\Properties\Plugins\ImportPluginPropertiesTest;
 
 /**
  * Tests for PhpMyAdmin\Properties\Plugins\ExportPluginProperties class. Extends PMA_ImportPluginProperties_Tests
diff --git a/test/classes/properties/plugins/ImportPluginPropertiesTest.php b/test/classes/Properties/Plugins/ImportPluginPropertiesTest.php
similarity index 92%
rename from test/classes/properties/plugins/ImportPluginPropertiesTest.php
rename to test/classes/Properties/Plugins/ImportPluginPropertiesTest.php
index a0d43f6296..dd98c73681 100644
--- a/test/classes/properties/plugins/ImportPluginPropertiesTest.php
+++ b/test/classes/Properties/Plugins/ImportPluginPropertiesTest.php
@@ -5,15 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Properties\Plugins;
 
 use PhpMyAdmin\Properties\Plugins\ImportPluginProperties;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * tests for PhpMyAdmin\Properties\Plugins\ImportPluginProperties class
  *
  * @package PhpMyAdmin-test
  */
-class ImportPluginPropertiesTest extends PHPUnit_Framework_TestCase
+class ImportPluginPropertiesTest extends TestCase
 {
     protected $object;
 
diff --git a/test/classes/properties/plugins/PluginPropertyItemTest.php b/test/classes/Properties/Plugins/PluginPropertyItemTest.php
similarity index 87%
rename from test/classes/properties/plugins/PluginPropertyItemTest.php
rename to test/classes/Properties/Plugins/PluginPropertyItemTest.php
index 7c28b506a1..4d319e9abf 100644
--- a/test/classes/properties/plugins/PluginPropertyItemTest.php
+++ b/test/classes/Properties/Plugins/PluginPropertyItemTest.php
@@ -5,13 +5,16 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Properties\Plugins;
+
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * Tests for PhpMyAdmin\Properties\Plugins\PluginPropertyItem class
  *
  * @package PhpMyAdmin-test
  */
-class PluginPropertyItemTest extends PHPUnit_Framework_TestCase
+class PluginPropertyItemTest extends TestCase
 {
     protected $stub;
 
diff --git a/test/classes/properties/PropertyItemTest.php b/test/classes/Properties/PropertyItemTest.php
similarity index 87%
rename from test/classes/properties/PropertyItemTest.php
rename to test/classes/Properties/PropertyItemTest.php
index 66a41e9dad..c7a5374729 100644
--- a/test/classes/properties/PropertyItemTest.php
+++ b/test/classes/Properties/PropertyItemTest.php
@@ -5,13 +5,16 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Properties;
+
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * Tests for PhpMyAdmin\Properties\PropertyItem class
  *
  * @package PhpMyAdmin-test
  */
-class PropertyItemTest extends PHPUnit_Framework_TestCase
+class PropertyItemTest extends TestCase
 {
     protected $stub;
 
diff --git a/test/classes/RelationTest.php b/test/classes/RelationTest.php
index 6cf5809eb8..7bb8324685 100644
--- a/test/classes/RelationTest.php
+++ b/test/classes/RelationTest.php
@@ -9,7 +9,7 @@ namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Relation;
 use PhpMyAdmin\Theme;
-
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * Tests for PhpMyAdmin\Relation
@@ -17,7 +17,7 @@ use PhpMyAdmin\Theme;
  * @package PhpMyAdmin-test
  * @group medium
  */
-class RelationTest extends \PHPUnit_Framework_TestCase
+class RelationTest extends TestCase
 {
     /**
      * Sets up the fixture, for example, opens a network connection.
diff --git a/test/classes/Rte/EventsTest.php b/test/classes/Rte/EventsTest.php
index 0e7cea2d73..601e8f476c 100644
--- a/test/classes/Rte/EventsTest.php
+++ b/test/classes/Rte/EventsTest.php
@@ -9,13 +9,14 @@ namespace PhpMyAdmin\Tests\Rte;
 
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Rte\Events;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * This class is for testing PhpMyAdmin\Rte\Events methods
  *
  * @package PhpMyAdmin-test
  */
-class EventsTest extends \PHPUnit_Framework_TestCase
+class EventsTest extends TestCase
 {
     /**
      * Set up
diff --git a/test/classes/Rte/RoutinesTest.php b/test/classes/Rte/RoutinesTest.php
index 1622ad3844..dae098ffdf 100644
--- a/test/classes/Rte/RoutinesTest.php
+++ b/test/classes/Rte/RoutinesTest.php
@@ -10,13 +10,14 @@ namespace PhpMyAdmin\Tests\Rte;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Rte\Routines;
 use PhpMyAdmin\TypesMySQL;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * This class is for testing PhpMyAdmin\Rte\Routines methods
  *
  * @package PhpMyAdmin-test
  */
-class RoutinesTest extends \PHPUnit_Framework_TestCase
+class RoutinesTest extends TestCase
 {
     /**
      * Set up
diff --git a/test/classes/Rte/TriggersTest.php b/test/classes/Rte/TriggersTest.php
index 45db01d1ab..fdbac00937 100644
--- a/test/classes/Rte/TriggersTest.php
+++ b/test/classes/Rte/TriggersTest.php
@@ -9,13 +9,14 @@ namespace PhpMyAdmin\Tests\Rte;
 
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Rte\Triggers;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * This class is for testing PhpMyAdmin\Rte\Triggers methods
  *
  * @package PhpMyAdmin-test
  */
-class TriggersTest extends \PHPUnit_Framework_TestCase
+class TriggersTest extends TestCase
 {
     /**
      * Set up
diff --git a/test/classes/SanitizeTest.php b/test/classes/SanitizeTest.php
index fcae9152b4..ce10f5736d 100644
--- a/test/classes/SanitizeTest.php
+++ b/test/classes/SanitizeTest.php
@@ -5,17 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
-/*
- * Include to test
- */
+namespace PhpMyAdmin\Tests;
+
 use PhpMyAdmin\Sanitize;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * Tests for methods in Sanitize class
  *
  * @package PhpMyAdmin-test
  */
-class SanitizeTest extends PHPUnit_Framework_TestCase
+class SanitizeTest extends TestCase
 {
     /**
      * Setup various pre conditions
diff --git a/test/classes/ScriptsTest.php b/test/classes/ScriptsTest.php
index b5a67c6d89..47ab2d5d62 100644
--- a/test/classes/ScriptsTest.php
+++ b/test/classes/ScriptsTest.php
@@ -5,21 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Scripts;
-
-require_once 'test/PMATestCase.php';
+use ReflectionClass;
 
 /**
  * Tests for Script.php
  *
  * @package PhpMyAdmin-test
  */
-class ScriptsTest extends PMATestCase
+class ScriptsTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/Server/CommonTest.php b/test/classes/Server/CommonTest.php
index 6bc0c4a597..e18ae5532b 100644
--- a/test/classes/Server/CommonTest.php
+++ b/test/classes/Server/CommonTest.php
@@ -9,13 +9,14 @@ namespace PhpMyAdmin\Tests\Server;
 
 use PhpMyAdmin\Server\Common;
 use PhpMyAdmin\Theme;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * This class is for testing PhpMyAdmin\Server\Common methods
  *
  * @package PhpMyAdmin-test
  */
-class CommonTest extends \PHPUnit_Framework_TestCase
+class CommonTest extends TestCase
 {
     /**
      * Test for Common::getHtmlForSubPageHeader
diff --git a/test/classes/Server/PrivilegesTest.php b/test/classes/Server/PrivilegesTest.php
index 75a9b226ff..5be2963a52 100644
--- a/test/classes/Server/PrivilegesTest.php
+++ b/test/classes/Server/PrivilegesTest.php
@@ -13,6 +13,7 @@ use PhpMyAdmin\Template;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * PhpMyAdmin\Tests\Server\PrivilegesTest class
@@ -21,7 +22,7 @@ use PhpMyAdmin\Util;
  *
  * @package PhpMyAdmin-test
  */
-class PrivilegesTest extends \PHPUnit_Framework_TestCase
+class PrivilegesTest extends TestCase
 {
     /**
      * Prepares environment for the test.
diff --git a/test/classes/Server/Status/AdvisorTest.php b/test/classes/Server/Status/AdvisorTest.php
index 11e089ba70..5a616b8e72 100644
--- a/test/classes/Server/Status/AdvisorTest.php
+++ b/test/classes/Server/Status/AdvisorTest.php
@@ -11,6 +11,7 @@ use PhpMyAdmin\Core;
 use PhpMyAdmin\Server\Status\Advisor;
 use PhpMyAdmin\Server\Status\Data;
 use PhpMyAdmin\Theme;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * PhpMyAdmin\Tests\Server\Status\AdvisorTest class
@@ -19,7 +20,7 @@ use PhpMyAdmin\Theme;
  *
  * @package PhpMyAdmin-test
  */
-class AdvisorTest extends \PHPUnit_Framework_TestCase
+class AdvisorTest extends TestCase
 {
     /**
      * Prepares environment for the test.
diff --git a/test/classes/Server/Status/DataTest.php b/test/classes/Server/Status/DataTest.php
index dc48fdb490..1fd03dd001 100644
--- a/test/classes/Server/Status/DataTest.php
+++ b/test/classes/Server/Status/DataTest.php
@@ -10,8 +10,6 @@ namespace PhpMyAdmin\Tests\Server\Status;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Server\Status\Data;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Test for PhpMyAdmin\Server\Status\Data class
  *
diff --git a/test/classes/Server/Status/MonitorTest.php b/test/classes/Server/Status/MonitorTest.php
index 8ecac0687f..e638401391 100644
--- a/test/classes/Server/Status/MonitorTest.php
+++ b/test/classes/Server/Status/MonitorTest.php
@@ -11,13 +11,14 @@ use PhpMyAdmin\Core;
 use PhpMyAdmin\Server\Status\Monitor;
 use PhpMyAdmin\Server\Status\Data;
 use PhpMyAdmin\Theme;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * this class is for testing PhpMyAdmin\Server\Status\Monitor methods
  *
  * @package PhpMyAdmin-test
  */
-class MonitorTest extends \PHPUnit_Framework_TestCase
+class MonitorTest extends TestCase
 {
     /**
      * Prepares environment for the test.
diff --git a/test/classes/Server/Status/ProcessesTest.php b/test/classes/Server/Status/ProcessesTest.php
index 935de31b33..d9bf0d35ff 100644
--- a/test/classes/Server/Status/ProcessesTest.php
+++ b/test/classes/Server/Status/ProcessesTest.php
@@ -11,6 +11,7 @@ use PhpMyAdmin\Core;
 use PhpMyAdmin\Server\Status\Processes;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Url;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * PhpMyAdmin\Tests\Server\Status\ProcessesTest class
@@ -19,7 +20,7 @@ use PhpMyAdmin\Url;
  *
  * @package PhpMyAdmin-test
  */
-class ProcessesTest extends \PHPUnit_Framework_TestCase
+class ProcessesTest extends TestCase
 {
     /**
      * Test for setUp
diff --git a/test/classes/Server/Status/QueriesTest.php b/test/classes/Server/Status/QueriesTest.php
index a35d441e72..79ac618741 100644
--- a/test/classes/Server/Status/QueriesTest.php
+++ b/test/classes/Server/Status/QueriesTest.php
@@ -12,6 +12,7 @@ use PhpMyAdmin\Server\Status\Data;
 use PhpMyAdmin\Server\Status\Queries;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Util;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * PhpMyAdmin\Tests\Server\Status\QueriesTest class
@@ -20,7 +21,7 @@ use PhpMyAdmin\Util;
  *
  * @package PhpMyAdmin-test
  */
-class QueriesTest extends \PHPUnit_Framework_TestCase
+class QueriesTest extends TestCase
 {
     /**
      * Prepares environment for the test.
diff --git a/test/classes/Server/Status/VariablesTest.php b/test/classes/Server/Status/VariablesTest.php
index edc481d704..0e9a2db8ca 100644
--- a/test/classes/Server/Status/VariablesTest.php
+++ b/test/classes/Server/Status/VariablesTest.php
@@ -11,13 +11,14 @@ use PhpMyAdmin\Core;
 use PhpMyAdmin\Server\Status\Data;
 use PhpMyAdmin\Server\Status\Variables;
 use PhpMyAdmin\Theme;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * This class is for testing PhpMyAdmin\Server\Status\Variables methods
  *
  * @package PhpMyAdmin-test
  */
-class VariablesTest extends \PHPUnit_Framework_TestCase
+class VariablesTest extends TestCase
 {
     /**
      * Prepares environment for the test.
diff --git a/test/classes/Server/StatusTest.php b/test/classes/Server/StatusTest.php
index 5b08382099..735ef2f1f8 100644
--- a/test/classes/Server/StatusTest.php
+++ b/test/classes/Server/StatusTest.php
@@ -11,6 +11,7 @@ use PhpMyAdmin\Core;
 use PhpMyAdmin\Server\Status;
 use PhpMyAdmin\Server\Status\Data;
 use PhpMyAdmin\Theme;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * PhpMyAdmin\Tests\Server\StatusTest class
@@ -19,7 +20,7 @@ use PhpMyAdmin\Theme;
  *
  * @package PhpMyAdmin-test
  */
-class StatusTest extends \PHPUnit_Framework_TestCase
+class StatusTest extends TestCase
 {
     /**
      * Prepares environment for the test.
diff --git a/test/classes/Server/UserGroupsTest.php b/test/classes/Server/UserGroupsTest.php
index 96b04243c9..0478c4b50c 100644
--- a/test/classes/Server/UserGroupsTest.php
+++ b/test/classes/Server/UserGroupsTest.php
@@ -10,13 +10,14 @@ namespace PhpMyAdmin\Tests\Server;
 use PhpMyAdmin\Server\UserGroups;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Url;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * Tests for PhpMyAdmin\Server\UserGroups
  *
  * @package PhpMyAdmin-test
  */
-class UserGroupsTest extends \PHPUnit_Framework_TestCase
+class UserGroupsTest extends TestCase
 {
     /**
      * Prepares environment for the test.
diff --git a/test/classes/Server/UsersTest.php b/test/classes/Server/UsersTest.php
index d220992474..c3fbb05964 100644
--- a/test/classes/Server/UsersTest.php
+++ b/test/classes/Server/UsersTest.php
@@ -8,6 +8,7 @@
 namespace PhpMyAdmin\Tests\Server;
 
 use PhpMyAdmin\Server\Users;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * PhpMyAdmin\Tests\Server\UsersTest class
@@ -16,7 +17,7 @@ use PhpMyAdmin\Server\Users;
  *
  * @package PhpMyAdmin-test
  */
-class UsersTest extends \PHPUnit_Framework_TestCase
+class UsersTest extends TestCase
 {
     /**
      * Test for Users::getHtmlForSubMenusOnUsersPage
diff --git a/test/classes/ConfigGeneratorTest.php b/test/classes/Setup/ConfigGeneratorTest.php
similarity index 97%
rename from test/classes/ConfigGeneratorTest.php
rename to test/classes/Setup/ConfigGeneratorTest.php
index 912237dc42..e790437dbf 100644
--- a/test/classes/ConfigGeneratorTest.php
+++ b/test/classes/Setup/ConfigGeneratorTest.php
@@ -5,24 +5,19 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Setup;
 
-/*
- * Include to test
- */
 use PhpMyAdmin\Config;
 use PhpMyAdmin\Config\ConfigFile;
 use PhpMyAdmin\Setup\ConfigGenerator;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Tests for PhpMyAdmin\Setup\ConfigGenerator
  *
  * @package PhpMyAdmin-test
  */
-class ConfigGeneratorTest extends PMATestCase
+class ConfigGeneratorTest extends \PMATestCase
 {
-
     /**
      * Test for ConfigGenerator::getConfigFile
      *
diff --git a/test/classes/SqlTest.php b/test/classes/SqlTest.php
index 2f436ea613..2c5331aa49 100644
--- a/test/classes/SqlTest.php
+++ b/test/classes/SqlTest.php
@@ -5,15 +5,18 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Sql;
+use PHPUnit_Framework_TestCase as TestCase;
+use stdClass;
 
 /**
  * Tests for PhpMyAdmin\Sql
  *
  * @package PhpMyAdmin-test
  */
-class SqlTest extends PHPUnit_Framework_TestCase
+class SqlTest extends TestCase
 {
     /**
      * Test Sql::getSqlWithLimitClause
diff --git a/test/classes/StorageEngineTest.php b/test/classes/StorageEngineTest.php
index 108232b362..8182a0c97c 100644
--- a/test/classes/StorageEngineTest.php
+++ b/test/classes/StorageEngineTest.php
@@ -4,10 +4,10 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\StorageEngine;
 
-require_once 'test/PMATestCase.php';
 /*
  * Include to test.
  */
@@ -18,7 +18,7 @@ require_once 'libraries/config.default.php';
  *
  * @package PhpMyAdmin-test
  */
-class StorageEngineTest extends PMATestCase
+class StorageEngineTest extends \PMATestCase
 {
     /**
      * @access protected
diff --git a/test/classes/Stubs/Response.php b/test/classes/Stubs/Response.php
index acece0f45b..20e60e80f9 100644
--- a/test/classes/Stubs/Response.php
+++ b/test/classes/Stubs/Response.php
@@ -15,9 +15,6 @@ namespace PhpMyAdmin\Tests\Stubs;
 use PhpMyAdmin\Header;
 use PhpMyAdmin\Message;
 
-
-
-
 /**
  * Class Response
  *
diff --git a/test/classes/SystemDatabaseTest.php b/test/classes/SystemDatabaseTest.php
index d342062875..454ad7babd 100644
--- a/test/classes/SystemDatabaseTest.php
+++ b/test/classes/SystemDatabaseTest.php
@@ -5,15 +5,16 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests;
 
-require_once 'test/PMATestCase.php';
+use PhpMyAdmin\SystemDatabase;
 
 /**
  * Tests for libraries/SystemDatabase.php
  *
  * @package PhpMyAdmin-test
  */
-class SystemDatabaseTest extends PMATestCase
+class SystemDatabaseTest extends \PMATestCase
 {
     /**
      * Setup function for test cases
@@ -66,7 +67,7 @@ class SystemDatabaseTest extends PMATestCase
                 )
             );
 
-        $this->sysDb = new PhpMyAdmin\SystemDatabase($dbi);
+        $this->sysDb = new SystemDatabase($dbi);
     }
 
     /**
diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php
index 132a96490e..7c416a0928 100644
--- a/test/classes/TableTest.php
+++ b/test/classes/TableTest.php
@@ -5,23 +5,23 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests;
 
-/*
- * Include to test.
- */
+use PhpMyAdmin\DatabaseInterface;
+use PhpMyAdmin\Dbi\DbiDummy;
+use PhpMyAdmin\Index;
 use PhpMyAdmin\Relation;
 use PhpMyAdmin\Table;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Util;
-
-require_once 'test/PMATestCase.php';
+use ReflectionClass;
 
 /**
  * Tests behaviour of Table class
  *
  * @package PhpMyAdmin-test
  */
-class TableTest extends PMATestCase
+class TableTest extends \PMATestCase
 {
     /**
      * Configures environment
@@ -945,7 +945,7 @@ class TableTest extends PMATestCase
     {
         $db = "pma_db";
         $table = "pma_table";
-        $index = new PhpMyAdmin\Index();
+        $index = new Index();
         $error = false;
 
         $_REQUEST['old_index'] = "PRIMARY";
@@ -1211,8 +1211,8 @@ class TableTest extends PMATestCase
         $target_db = 'pma_test';
         $tbl_object = new Table($target_db, $target_table);
         $tbl_object->getStatusInfo(null, true);
-        $extension = new PhpMyAdmin\Dbi\DbiDummy();
-        $dbi = new PhpMyAdmin\DatabaseInterface($extension);
+        $extension = new DbiDummy();
+        $dbi = new DatabaseInterface($extension);
         $expect = '';
         $tbl_storage_engine = $dbi->getTable(
             $target_db,
@@ -1234,8 +1234,8 @@ class TableTest extends PMATestCase
         $target_db = 'pma_test';
         $tbl_object = new Table($target_db, $target_table);
         $tbl_object->getStatusInfo(null, true);
-        $extension = new PhpMyAdmin\Dbi\DbiDummy();
-        $dbi = new PhpMyAdmin\DatabaseInterface($extension);
+        $extension = new DbiDummy();
+        $dbi = new DatabaseInterface($extension);
         $expect = '';
         $show_comment = $dbi->getTable(
             $target_db,
@@ -1257,8 +1257,8 @@ class TableTest extends PMATestCase
         $target_db = 'pma_test';
         $tbl_object = new Table($target_db, $target_table);
         $tbl_object->getStatusInfo(null, true);
-        $extension = new PhpMyAdmin\Dbi\DbiDummy();
-        $dbi = new PhpMyAdmin\DatabaseInterface($extension);
+        $extension = new DbiDummy();
+        $dbi = new DatabaseInterface($extension);
         $expect = '';
         $tbl_collation = $dbi->getTable(
             $target_db,
@@ -1280,8 +1280,8 @@ class TableTest extends PMATestCase
         $target_db = 'pma_test';
         $tbl_object = new Table($target_db, $target_table);
         $tbl_object->getStatusInfo(null, true);
-        $extension = new PhpMyAdmin\Dbi\DbiDummy();
-        $dbi = new PhpMyAdmin\DatabaseInterface($extension);
+        $extension = new DbiDummy();
+        $dbi = new DatabaseInterface($extension);
         $expect = '';
         $row_format = $dbi->getTable(
             $target_db,
@@ -1303,8 +1303,8 @@ class TableTest extends PMATestCase
         $target_db = 'pma_test';
         $tbl_object = new Table($target_db, $target_table);
         $tbl_object->getStatusInfo(null, true);
-        $extension = new PhpMyAdmin\Dbi\DbiDummy();
-        $dbi = new PhpMyAdmin\DatabaseInterface($extension);
+        $extension = new DbiDummy();
+        $dbi = new DatabaseInterface($extension);
         $expect = '';
         $auto_increment = $dbi->getTable(
             $target_db,
@@ -1326,8 +1326,8 @@ class TableTest extends PMATestCase
         $target_db = 'pma_test';
         $tbl_object = new Table($target_db, $target_table);
         $tbl_object->getStatusInfo(null, true);
-        $extension = new PhpMyAdmin\Dbi\DbiDummy();
-        $dbi = new PhpMyAdmin\DatabaseInterface($extension);
+        $extension = new DbiDummy();
+        $dbi = new DatabaseInterface($extension);
         $expect = array('pack_keys' => 'DEFAULT');
         $create_options = $dbi->getTable(
             $target_db,
diff --git a/test/classes/TemplateTest.php b/test/classes/TemplateTest.php
index abaaba9cff..3bbbbb72c2 100644
--- a/test/classes/TemplateTest.php
+++ b/test/classes/TemplateTest.php
@@ -5,8 +5,7 @@
  *
  * @package PhpMyAdmin-test
  */
-
-require_once 'test/PMATestCase.php';
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Template;
 
@@ -15,7 +14,7 @@ use PhpMyAdmin\Template;
  *
  * @package PhpMyAdmin-test
  */
-class TemplateTest extends PMATestCase
+class TemplateTest extends \PMATestCase
 {
     /**
      * Test for set function
diff --git a/test/classes/ThemeManagerTest.php b/test/classes/ThemeManagerTest.php
index 6dcb82ef02..ccabc56878 100644
--- a/test/classes/ThemeManagerTest.php
+++ b/test/classes/ThemeManagerTest.php
@@ -5,20 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests;
 
-/*
- * Include to test.
- */
+use PhpMyAdmin\Config;
 use PhpMyAdmin\ThemeManager;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * tests for ThemeManager class
  *
  * @package PhpMyAdmin-test
  */
-class ThemeManagerTest extends PMATestCase
+class ThemeManagerTest extends \PMATestCase
 {
     /**
      * SetUp for test cases
@@ -31,7 +28,7 @@ class ThemeManagerTest extends PMATestCase
         $GLOBALS['cfg']['ThemeDefault'] = 'pmahomme';
         $GLOBALS['cfg']['ServerDefault'] = 0;
         $GLOBALS['server'] = 99;
-        $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config();
+        $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['collation_connection'] = 'utf8_general_ci';
 
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
diff --git a/test/classes/ThemeTest.php b/test/classes/ThemeTest.php
index 61107d1474..4f4159d0cb 100644
--- a/test/classes/ThemeTest.php
+++ b/test/classes/ThemeTest.php
@@ -5,16 +5,17 @@
  *
  * @package PhpMyAdmin-test
  */
-use PhpMyAdmin\Theme;
+namespace PhpMyAdmin\Tests;
 
-require_once 'test/PMATestCase.php';
+use PhpMyAdmin\Config;
+use PhpMyAdmin\Theme;
 
 /**
  * Test class for Theme.
  *
  * @package PhpMyAdmin-test
  */
-class ThemeTest extends PMATestCase
+class ThemeTest extends \PMATestCase
 {
     /**
      * @var Theme
@@ -37,7 +38,7 @@ class ThemeTest extends PMATestCase
         $this->object = new Theme();
         $this->backup = $GLOBALS['PMA_Theme'];
         $GLOBALS['PMA_Theme'] = $this->object;
-        $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config();
+        $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['text_dir'] = 'ltr';
         include 'themes/pmahomme/layout.inc.php';
diff --git a/test/classes/TrackerTest.php b/test/classes/TrackerTest.php
index bebcdc9823..885840ca92 100644
--- a/test/classes/TrackerTest.php
+++ b/test/classes/TrackerTest.php
@@ -5,23 +5,20 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests;
 
-/*
- * Include to test.
- */
 use PhpMyAdmin\Tracker;
 use PhpMyAdmin\Util;
-
-require_once 'test/PMATestCase.php';
+use PHPUnit_Framework_Assert as Assert;
+use ReflectionClass;
 
 /**
  * Tests for PhpMyAdmin\Tracker
  *
  * @package PhpMyAdmin-test
  */
-class TrackerTest extends PMATestCase
+class TrackerTest extends \PMATestCase
 {
-
     /**
      * Setup function for test cases
      *
@@ -65,7 +62,7 @@ class TrackerTest extends PMATestCase
     {
         Tracker::enable();
         $this->assertTrue(
-            PHPUnit_Framework_Assert::readAttribute('PhpMyAdmin\Tracker', 'enabled')
+            Assert::readAttribute('PhpMyAdmin\Tracker', 'enabled')
         );
     }
 
@@ -120,7 +117,7 @@ class TrackerTest extends PMATestCase
      */
     public function testGetTableName($string, $expected)
     {
-        $reflection = new \ReflectionClass('PhpMyAdmin\Tracker');
+        $reflection = new ReflectionClass('PhpMyAdmin\Tracker');
         $method = $reflection->getMethod("getTableName");
         $method->setAccessible(true);
 
diff --git a/test/classes/TrackingTest.php b/test/classes/TrackingTest.php
index 3d550c3802..3caf5935fe 100644
--- a/test/classes/TrackingTest.php
+++ b/test/classes/TrackingTest.php
@@ -10,14 +10,14 @@ namespace PhpMyAdmin\Tests;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Tracking;
 use PhpMyAdmin\Url;
-
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * Tests for PhpMyAdmin\Tracking
  *
  * @package PhpMyAdmin-test
  */
-class TrackingTest extends \PHPUnit_Framework_TestCase
+class TrackingTest extends TestCase
 {
 
     /**
diff --git a/test/classes/TransformationsTest.php b/test/classes/TransformationsTest.php
index 0fd79e033f..e37ec9b99d 100644
--- a/test/classes/TransformationsTest.php
+++ b/test/classes/TransformationsTest.php
@@ -5,20 +5,18 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Transformations;
-
-/*
- * Include to test.
- */
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * tests for transformation wrappers
  *
  * @package PhpMyAdmin-test
  */
-class TransformationsTest extends PHPUnit_Framework_TestCase
+class TransformationsTest extends TestCase
 {
     /**
      * Set up global environment.
diff --git a/test/classes/TypesMySQLTest.php b/test/classes/TypesMySQLTest.php
index 5c547c4231..0779e66e69 100644
--- a/test/classes/TypesMySQLTest.php
+++ b/test/classes/TypesMySQLTest.php
@@ -4,21 +4,16 @@
  *
  * @package PhpMyAdmin-test
  */
-
-/*
- * Include to test.
- */
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\TypesMySQL;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Testcase for MySQL types handling.
  *
  * @package PhpMyAdmin-test
  */
-class TypesMySQLTest extends PMATestCase
+class TypesMySQLTest extends \PMATestCase
 {
     /**
      * @var PhpMyAdmin\Types
diff --git a/test/classes/TypesTest.php b/test/classes/TypesTest.php
index fcf8497955..61e351ebe7 100644
--- a/test/classes/TypesTest.php
+++ b/test/classes/TypesTest.php
@@ -4,16 +4,16 @@
  *
  * @package PhpMyAdmin-test
  */
-use PhpMyAdmin\Types;
+namespace PhpMyAdmin\Tests;
 
-require_once 'test/PMATestCase.php';
+use PhpMyAdmin\Types;
 
 /**
  * Test class for Types.
  *
  * @package PhpMyAdmin-test
  */
-class TypesTest extends PMATestCase
+class TypesTest extends \PMATestCase
 {
     /**
      * @var Types
diff --git a/test/classes/UrlTest.php b/test/classes/UrlTest.php
index 918c6fe989..6a8ec190bd 100644
--- a/test/classes/UrlTest.php
+++ b/test/classes/UrlTest.php
@@ -5,19 +5,18 @@
  *
  * @package PhpMyAdmin-test
  */
-/*
- * Include to text.
- */
+namespace PhpMyAdmin\Tests;
+
 use PhpMyAdmin\Url;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * Tests for methods in URL class
  *
  * @package PhpMyAdmin-test
  */
-class UrlTest extends PHPUnit_Framework_TestCase
+class UrlTest extends TestCase
 {
-
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php
index 89924b3ca5..71da212ad7 100644
--- a/test/classes/UtilTest.php
+++ b/test/classes/UtilTest.php
@@ -5,17 +5,16 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Util;
 
-require_once 'test/PMATestCase.php';
-
 /**
  * Test for PhpMyAdmin\Util class
  *
  * @package PhpMyAdmin-test
  */
-class UtilTest extends PMATestCase
+class UtilTest extends \PMATestCase
 {
 
     /**
diff --git a/test/classes/VersionInformationTest.php b/test/classes/VersionInformationTest.php
index 20f7ffa8a0..421c80f4ae 100644
--- a/test/classes/VersionInformationTest.php
+++ b/test/classes/VersionInformationTest.php
@@ -2,23 +2,20 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Tests for methods in PhpMyAdmin\VersionInformation class
-*
-* @package PhpMyAdmin-test
-*/
-
-/*
- * Include to test.
+ *
+ * @package PhpMyAdmin-test
  */
-use PhpMyAdmin\VersionInformation;
+namespace PhpMyAdmin\Tests;
 
-require_once 'test/PMATestCase.php';
+use PhpMyAdmin\VersionInformation;
+use stdClass;
 
 /**
  * Tests for methods in PhpMyAdmin\VersionInformation class
  *
  * @package PhpMyAdmin-test
  */
-class VersionInformationTest extends PMATestCase
+class VersionInformationTest extends \PMATestCase
 {
     private $_releases;
 
diff --git a/test/classes/ZipExtensionTest.php b/test/classes/ZipExtensionTest.php
index 41550f4b94..2a964f6cb1 100644
--- a/test/classes/ZipExtensionTest.php
+++ b/test/classes/ZipExtensionTest.php
@@ -4,17 +4,17 @@
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\ZipExtension;
-
-require_once 'test/PMATestCase.php';
+use ZipArchive;
 
 /**
  * Tests zip extension usage.
  *
  * @package PhpMyAdmin-test
  */
-class ZipExtensionTest extends PMATestCase
+class ZipExtensionTest extends \PMATestCase
 {
     /**
      * Test for ZipExtension::getContents