diff --git a/test/classes/PMA_StorageEngine_test.php b/test/classes/PMA_StorageEngine_test.php
index 579dfe3013..fe7a226164 100644
--- a/test/classes/PMA_StorageEngine_test.php
+++ b/test/classes/PMA_StorageEngine_test.php
@@ -12,6 +12,8 @@
 require_once 'libraries/StorageEngine.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/Util.class.php';
+require_once 'libraries/Config.class.php';
+require_once 'libraries/config.default.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/Tracker.class.php';
 
diff --git a/test/classes/PMA_TableReplaceSearch_test.php b/test/classes/PMA_TableReplaceSearch_test.php
index c9e1fcabe8..45fbbf7fdb 100644
--- a/test/classes/PMA_TableReplaceSearch_test.php
+++ b/test/classes/PMA_TableReplaceSearch_test.php
@@ -11,6 +11,7 @@ require_once 'libraries/Util.class.php';
  * Include to test.
  */
 require_once 'libraries/TableSearch.class.php';
+require_once 'libraries/DatabaseInterface.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
 
 /**
@@ -153,4 +154,4 @@ class PMA_TableReplaceSearchTest extends PHPUnit_Framework_TestCase
         $this->_object->replace(0, $find, $replaceWith, $charSet);
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/test/classes/PMA_TableSearch_test.php b/test/classes/PMA_TableSearch_test.php
index 14c46e487d..4b43f4e789 100644
--- a/test/classes/PMA_TableSearch_test.php
+++ b/test/classes/PMA_TableSearch_test.php
@@ -10,6 +10,7 @@
  * Include to test.
  */
 require_once 'libraries/url_generating.lib.php';
+require_once 'libraries/DatabaseInterface.class.php';
 require_once 'libraries/TableSearch.class.php';
 require_once 'libraries/Util.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
diff --git a/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php b/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
index 9524f8c298..bec375e793 100644
--- a/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
+++ b/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
@@ -7,6 +7,7 @@
  */
 
 require_once 'libraries/plugins/auth/AuthenticationHttp.class.php';
+require_once 'libraries/DatabaseInterface.class.php';
 require_once 'libraries/Util.class.php';
 require_once 'libraries/Message.class.php';
 require_once 'libraries/Theme.class.php';
diff --git a/test/classes/plugin/auth/PMA_AuthenticationSignon_test.php b/test/classes/plugin/auth/PMA_AuthenticationSignon_test.php
index 47bd835e7b..5c2ad66891 100644
--- a/test/classes/plugin/auth/PMA_AuthenticationSignon_test.php
+++ b/test/classes/plugin/auth/PMA_AuthenticationSignon_test.php
@@ -7,6 +7,7 @@
  */
 
 require_once 'libraries/plugins/auth/AuthenticationSignon.class.php';
+require_once 'libraries/DatabaseInterface.class.php';
 require_once 'libraries/Util.class.php';
 require_once 'libraries/Message.class.php';
 require_once 'libraries/Theme.class.php';
diff --git a/test/classes/plugin/export/PMA_ExportCodegen_test.php b/test/classes/plugin/export/PMA_ExportCodegen_test.php
index 5a1362062f..05d37606b7 100644
--- a/test/classes/plugin/export/PMA_ExportCodegen_test.php
+++ b/test/classes/plugin/export/PMA_ExportCodegen_test.php
@@ -7,6 +7,7 @@
  */
 require_once 'libraries/export.lib.php';
 require_once 'libraries/plugins/export/ExportCodegen.class.php';
+require_once 'libraries/DatabaseInterface.class.php';
 require_once 'libraries/Util.class.php';
 require_once 'libraries/Theme.class.php';
 require_once 'libraries/Config.class.php';
diff --git a/test/classes/plugin/export/PMA_ExportCsv_test.php b/test/classes/plugin/export/PMA_ExportCsv_test.php
index 478f8ff17e..49aee08e08 100644
--- a/test/classes/plugin/export/PMA_ExportCsv_test.php
+++ b/test/classes/plugin/export/PMA_ExportCsv_test.php
@@ -7,11 +7,13 @@
  */
 require_once 'libraries/plugins/export/ExportCsv.class.php';
 require_once 'libraries/export.lib.php';
+require_once 'libraries/DatabaseInterface.class.php';
 require_once 'libraries/Util.class.php';
 require_once 'libraries/Theme.class.php';
 require_once 'libraries/Config.class.php';
 require_once 'libraries/config.default.php';
 require_once 'libraries/php-gettext/gettext.inc';
+require_once 'libraries/Message.class.php';
 require_once 'export.php';
 /**
  * tests for ExportCsv class
diff --git a/test/classes/plugin/export/PMA_ExportJson_test.php b/test/classes/plugin/export/PMA_ExportJson_test.php
index c00bd91905..1dc07ac2f3 100644
--- a/test/classes/plugin/export/PMA_ExportJson_test.php
+++ b/test/classes/plugin/export/PMA_ExportJson_test.php
@@ -10,6 +10,7 @@ require_once 'libraries/export.lib.php';
 require_once 'libraries/Util.class.php';
 require_once 'libraries/Theme.class.php';
 require_once 'libraries/Config.class.php';
+require_once 'libraries/DatabaseInterface.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/config.default.php';
 require_once 'export.php';
diff --git a/test/classes/plugin/export/PMA_ExportLatex_test.php b/test/classes/plugin/export/PMA_ExportLatex_test.php
index ed54ef8ce4..2d170195b5 100644
--- a/test/classes/plugin/export/PMA_ExportLatex_test.php
+++ b/test/classes/plugin/export/PMA_ExportLatex_test.php
@@ -10,8 +10,10 @@ require_once 'libraries/export.lib.php';
 require_once 'libraries/Util.class.php';
 require_once 'libraries/Theme.class.php';
 require_once 'libraries/Config.class.php';
+require_once 'libraries/DatabaseInterface.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/config.default.php';
+require_once 'libraries/relation.lib.php';
 require_once 'export.php';
 /**
  * tests for ExportLatex class
diff --git a/test/classes/plugin/export/PMA_ExportMediawiki_test.php b/test/classes/plugin/export/PMA_ExportMediawiki_test.php
index 8864d601ba..6dbbd47af0 100644
--- a/test/classes/plugin/export/PMA_ExportMediawiki_test.php
+++ b/test/classes/plugin/export/PMA_ExportMediawiki_test.php
@@ -6,6 +6,8 @@
  * @package PhpMyAdmin-test
  */
 require_once 'libraries/plugins/export/ExportMediawiki.class.php';
+require_once 'libraries/DatabaseInterface.class.php';
+require_once 'libraries/export.lib.php';
 require_once 'libraries/Util.class.php';
 require_once 'libraries/Theme.class.php';
 require_once 'libraries/Config.class.php';
diff --git a/test/classes/plugin/export/PMA_ExportPdf_test.php b/test/classes/plugin/export/PMA_ExportPdf_test.php
index 0385ebb02f..cf2060d532 100644
--- a/test/classes/plugin/export/PMA_ExportPdf_test.php
+++ b/test/classes/plugin/export/PMA_ExportPdf_test.php
@@ -13,6 +13,7 @@ require_once 'libraries/Theme.class.php';
 require_once 'libraries/Config.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/config.default.php';
+require_once 'libraries/properties/options/items/MessageOnlyPropertyItem.class.php';
 require_once 'export.php';
 /**
  * tests for ExportPdf class
diff --git a/test/classes/plugin/export/PMA_ExportSql_test.php b/test/classes/plugin/export/PMA_ExportSql_test.php
index 749d781483..8c91982431 100644
--- a/test/classes/plugin/export/PMA_ExportSql_test.php
+++ b/test/classes/plugin/export/PMA_ExportSql_test.php
@@ -6,11 +6,15 @@
  * @package PhpMyAdmin-test
  */
 require_once 'libraries/plugins/export/ExportSql.class.php';
+require_once 'libraries/DatabaseInterface.class.php';
+require_once 'libraries/export.lib.php';
 require_once 'libraries/Util.class.php';
 require_once 'libraries/Theme.class.php';
 require_once 'libraries/Config.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/config.default.php';
+require_once 'libraries/mysql_charsets.lib.php';
+require_once 'libraries/relation.lib.php';
 require_once 'export.php';
 /**
  * tests for ExportSql class
diff --git a/test/classes/plugin/transformations/Text_Plain_Sql_test.php b/test/classes/plugin/transformations/Text_Plain_Sql_test.php
index 04270791c8..2d8e2ef90d 100644
--- a/test/classes/plugin/transformations/Text_Plain_Sql_test.php
+++ b/test/classes/plugin/transformations/Text_Plain_Sql_test.php
@@ -10,6 +10,7 @@
  */
 
 /* Each PluginObserver instance contains a PluginManager instance */
+require_once 'libraries/Util.class.php';
 require_once 'libraries/plugins/PluginManager.class.php';
 require_once 'libraries/plugins/transformations/Text_Plain_Sql.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
diff --git a/test/libraries/PMA_Tracker_test.php b/test/libraries/PMA_Tracker_test.php
index 1d0ca474d6..1a43cbc6a8 100644
--- a/test/libraries/PMA_Tracker_test.php
+++ b/test/libraries/PMA_Tracker_test.php
@@ -10,6 +10,7 @@
  * Include to test.
  */
 require_once 'libraries/Tracker.class.php';
+require_once 'libraries/DatabaseInterface.class.php';
 require_once 'libraries/Util.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/relation.lib.php';
diff --git a/test/libraries/PMA_tbl_columns_definition_form_test.php b/test/libraries/PMA_tbl_columns_definition_form_test.php
index c87b564aee..6aa90e0994 100644
--- a/test/libraries/PMA_tbl_columns_definition_form_test.php
+++ b/test/libraries/PMA_tbl_columns_definition_form_test.php
@@ -11,9 +11,12 @@
  */
 require_once 'libraries/Util.class.php';
 require_once 'libraries/tbl_columns_definition_form.lib.php';
+require_once 'libraries/DatabaseInterface.class.php';
 require_once 'libraries/Partition.class.php';
 require_once 'libraries/Types.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
+require_once 'libraries/transformations.lib.php';
+require_once 'libraries/mysql_charsets.lib.php';
 
 /**
  * Tests for libraries/tbl_columns_definition_form.lib.php
diff --git a/test/libraries/PMA_user_preferences_test.php b/test/libraries/PMA_user_preferences_test.php
index 0d21837c0f..3e97ed04a7 100644
--- a/test/libraries/PMA_user_preferences_test.php
+++ b/test/libraries/PMA_user_preferences_test.php
@@ -10,11 +10,13 @@
  * Include to test
  */
 require_once 'libraries/user_preferences.lib.php';
+require_once 'libraries/DatabaseInterface.class.php';
 require_once 'libraries/config/ConfigFile.class.php';
 require_once 'libraries/core.lib.php';
 require_once 'libraries/Util.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/relation.lib.php';
+require_once 'libraries/url_generating.lib.php';
 
 /**
  * tests for methods under user_preferences libarary