diff --git a/test/classes/controllers/TableSearchController_test.php b/test/classes/controllers/TableSearchController_test.php
index 0086fe2d90..ff832f953a 100644
--- a/test/classes/controllers/TableSearchController_test.php
+++ b/test/classes/controllers/TableSearchController_test.php
@@ -282,12 +282,12 @@ class PMA_TableSearchController_Test extends PHPUnit_Framework_TestCase
             ->will($this->returnValue(false));
         $GLOBALS['PMA_Types'] = $types;
 
-        $class = new ReflectionClass('\PMA\Controllers\Table\TableSearchController');
+        $class = new ReflectionClass('\PMA\libraries\controllers\Table\TableSearchController');
         $method = $class->getMethod('_generateWhereClause');
         $method->setAccessible(true);
 
         $container = Container::getDefaultContainer();
-        $container->factory('\PMA\Controllers\Table\TableSearchController');
+        $container->factory('\PMA\libraries\controllers\Table\TableSearchController');
         $container->alias(
             'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
         );
@@ -366,7 +366,7 @@ class PMA_TableSearchController_Test extends PHPUnit_Framework_TestCase
 
         $container = Container::getDefaultContainer();
         $container->set('dbi', $GLOBALS['dbi']);
-        $container->factory('\PMA\Controllers\Table\TableSearchController');
+        $container->factory('\PMA\libraries\controllers\Table\TableSearchController');
         $container->alias(
             'TableSearchController', 'PMA\libraries\controllers\table\TableSearchController'
         );
diff --git a/test/classes/controllers/TableStructureController_test.php b/test/classes/controllers/TableStructureController_test.php
index 4ca30244dc..b84c053943 100644
--- a/test/classes/controllers/TableStructureController_test.php
+++ b/test/classes/controllers/TableStructureController_test.php
@@ -100,7 +100,7 @@ class TableStructureController_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['dbi']->expects($this->any())->method('fetchAssoc')
             ->will($this->returnValue(null));
 
-        $class = new ReflectionClass('\PMA\Controllers\TableStructureController');
+        $class = new ReflectionClass('\PMA\libraries\controllers\TableStructureController');
         $method = $class->getMethod('getKeyForTablePrimary');
         $method->setAccessible(true);
 
@@ -148,7 +148,7 @@ class TableStructureController_Test extends PHPUnit_Framework_TestCase
                 )
             );
 
-        $class = new ReflectionClass('\PMA\Controllers\TableStructureController');
+        $class = new ReflectionClass('\PMA\libraries\controllers\TableStructureController');
         $method = $class->getMethod('getKeyForTablePrimary');
         $method->setAccessible(true);
 
@@ -174,7 +174,7 @@ class TableStructureController_Test extends PHPUnit_Framework_TestCase
      */
     public function testAdjustColumnPrivileges()
     {
-        $class = new ReflectionClass('\PMA\Controllers\TableStructureController');
+        $class = new ReflectionClass('\PMA\libraries\controllers\TableStructureController');
         $method = $class->getMethod('adjustColumnPrivileges');
         $method->setAccessible(true);
 
@@ -205,7 +205,7 @@ class TableStructureController_Test extends PHPUnit_Framework_TestCase
             $this->markTestSkipped("Cannot redefine PMA_DRIZZLE constant");
         }
 
-        $class = new ReflectionClass('\PMA\Controllers\TableStructureController');
+        $class = new ReflectionClass('\PMA\libraries\controllers\TableStructureController');
         $method = $class->getMethod('adjustColumnPrivileges');
         $method->setAccessible(true);
 
@@ -242,7 +242,7 @@ class TableStructureController_Test extends PHPUnit_Framework_TestCase
      */
     public function testGetMultipleFieldCommandType()
     {
-        $class = new ReflectionClass('\PMA\Controllers\TableStructureController');
+        $class = new ReflectionClass('\PMA\libraries\controllers\TableStructureController');
         $method = $class->getMethod('getMultipleFieldCommandType');
         $method->setAccessible(true);