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;