diff --git a/test/classes/plugin/auth/PMA_AuthenticationConfig_test.php b/test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
index ce74f4b945..4c00c0e548 100644
--- a/test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
+++ b/test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
@@ -7,12 +7,15 @@
  */
 
 require_once 'libraries/plugins/auth/AuthenticationConfig.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';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/config.default.php';
+require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/Error_Handler.class.php';
+require_once 'libraries/Response.class.php';
 /**
  * tests for AuthenticationConfig class
  *
@@ -102,6 +105,11 @@ class PMA_AuthenticationConfig_Test extends PHPUnit_Framework_TestCase
             }
         }
 
+        $dbi = $this->getMockBuilder('PMA_DatabaseInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $GLOBALS['dbi'] = $dbi;
+
         ob_start();
         $result = $this->object->authFails();
         $html = ob_get_clean();
diff --git a/test/classes/plugin/export/PMA_ExportHtmlword_test.php b/test/classes/plugin/export/PMA_ExportHtmlword_test.php
index df12c8065f..0c1f0ccba9 100644
--- a/test/classes/plugin/export/PMA_ExportHtmlword_test.php
+++ b/test/classes/plugin/export/PMA_ExportHtmlword_test.php
@@ -14,6 +14,7 @@ require_once 'libraries/Config.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/config.default.php';
 require_once 'libraries/relation.lib.php';
+require_once 'libraries/transformations.lib.php';
 require_once 'export.php';
 /**
  * tests for ExportHtmlword class
@@ -31,6 +32,10 @@ class PMA_ExportHtmlword_Test extends PHPUnit_Framework_TestCase
      */
     function setup()
     {
+        if (!defined("PMA_DRIZZLE")) {
+            define("PMA_DRIZZLE", false);
+        }
+
         $GLOBALS['server'] = 0;
         $this->object = new ExportHtmlword();
         $GLOBALS['output_kanji_conversion'] = false;
diff --git a/test/classes/plugin/export/PMA_ExportLatex_test.php b/test/classes/plugin/export/PMA_ExportLatex_test.php
index 2d170195b5..e70c81b304 100644
--- a/test/classes/plugin/export/PMA_ExportLatex_test.php
+++ b/test/classes/plugin/export/PMA_ExportLatex_test.php
@@ -14,6 +14,7 @@ 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 'libraries/transformations.lib.php';
 require_once 'export.php';
 /**
  * tests for ExportLatex class
@@ -31,6 +32,10 @@ class PMA_ExportLatex_Test extends PHPUnit_Framework_TestCase
      */
     function setup()
     {
+        if (!defined("PMA_DRIZZLE")) {
+            define("PMA_DRIZZLE", false);
+        }
+
         $GLOBALS['server'] = 0;
         $GLOBALS['output_kanji_conversion'] = false;
         $GLOBALS['output_charset_conversion'] = false;
diff --git a/test/classes/plugin/export/PMA_ExportOdt_test.php b/test/classes/plugin/export/PMA_ExportOdt_test.php
index de60e7b25a..52d9993a56 100644
--- a/test/classes/plugin/export/PMA_ExportOdt_test.php
+++ b/test/classes/plugin/export/PMA_ExportOdt_test.php
@@ -14,6 +14,7 @@ require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/config.default.php';
 require_once 'libraries/DatabaseInterface.class.php';
 require_once 'libraries/relation.lib.php';
+require_once 'libraries/transformations.lib.php';
 require_once 'export.php';
 
 /**
@@ -32,6 +33,10 @@ class PMA_ExportOdt_Test extends PHPUnit_Framework_TestCase
      */
     function setup()
     {
+        if (!defined("PMA_DRIZZLE")) {
+            define("PMA_DRIZZLE", false);
+        }
+
         $GLOBALS['server'] = 0;
         $GLOBALS['output_kanji_conversion'] = false;
         $GLOBALS['output_charset_conversion'] = false;
diff --git a/test/classes/plugin/export/PMA_ExportSql_test.php b/test/classes/plugin/export/PMA_ExportSql_test.php
index 4d25ee62b4..bdf48b74db 100644
--- a/test/classes/plugin/export/PMA_ExportSql_test.php
+++ b/test/classes/plugin/export/PMA_ExportSql_test.php
@@ -15,8 +15,10 @@ 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 'libraries/transformations.lib.php';
 require_once 'libraries/Table.class.php';
 require_once 'libraries/sqlparser.lib.php';
+require_once 'libraries/charset_conversion.lib.php';
 require_once 'export.php';
 /**
  * tests for ExportSql class
@@ -34,6 +36,10 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase
      */
     function setup()
     {
+        if (!defined("PMA_DRIZZLE")) {
+            define("PMA_DRIZZLE", false);
+        }
+
         $GLOBALS['server'] = 0;
         $GLOBALS['output_kanji_conversion'] = false;
         $GLOBALS['buffer_needed'] = false;
diff --git a/test/classes/plugin/export/PMA_ExportTexytext_test.php b/test/classes/plugin/export/PMA_ExportTexytext_test.php
index 36ab93ae3e..ee2f92bc89 100644
--- a/test/classes/plugin/export/PMA_ExportTexytext_test.php
+++ b/test/classes/plugin/export/PMA_ExportTexytext_test.php
@@ -15,6 +15,7 @@ require_once 'libraries/config.default.php';
 require_once 'libraries/DatabaseInterface.class.php';
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/sqlparser.lib.php';
+require_once 'libraries/transformations.lib.php';
 require_once 'export.php';
 /**
  * tests for ExportTexytext class
@@ -32,6 +33,10 @@ class PMA_ExportTexytext_Test extends PHPUnit_Framework_TestCase
      */
     function setup()
     {
+        if (!defined("PMA_DRIZZLE")) {
+            define("PMA_DRIZZLE", false);
+        }
+
         $GLOBALS['server'] = 0;
         $GLOBALS['output_kanji_conversion'] = false;
         $GLOBALS['buffer_needed'] = false;
diff --git a/test/classes/plugin/export/PMA_ExportXml_test.php b/test/classes/plugin/export/PMA_ExportXml_test.php
index c3b9dfe3a3..990eec3397 100644
--- a/test/classes/plugin/export/PMA_ExportXml_test.php
+++ b/test/classes/plugin/export/PMA_ExportXml_test.php
@@ -7,7 +7,9 @@
  */
 $GLOBALS['db'] = 'db';
 require_once 'libraries/plugins/export/ExportXml.class.php';
+require_once 'libraries/DatabaseInterface.class.php';
 require_once 'libraries/Util.class.php';
+require_once 'libraries/export.lib.php';
 require_once 'libraries/Theme.class.php';
 require_once 'libraries/Config.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
@@ -29,6 +31,10 @@ class PMA_ExportXml_Test extends PHPUnit_Framework_TestCase
      */
     function setup()
     {
+        if (!defined("PMA_DRIZZLE")) {
+            define("PMA_DRIZZLE", false);
+        }
+
         $GLOBALS['server'] = 0;
         $GLOBALS['output_kanji_conversion'] = false;
         $GLOBALS['buffer_needed'] = false;
diff --git a/test/classes/plugin/transformations/Image_JPEG_Inline_test.php b/test/classes/plugin/transformations/Image_JPEG_Inline_test.php
index 4172f1770d..58df61b76d 100644
--- a/test/classes/plugin/transformations/Image_JPEG_Inline_test.php
+++ b/test/classes/plugin/transformations/Image_JPEG_Inline_test.php
@@ -13,6 +13,8 @@
 require_once 'libraries/plugins/PluginManager.class.php';
 require_once 'libraries/plugins/transformations/Image_JPEG_Inline.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
+require_once 'libraries/Config.class.php';
+require_once 'libraries/config.default.php';
 
 /**
  * Tests for Image_JPEG_Inline class
@@ -35,6 +37,8 @@ class Image_JPEG_Inline_Test extends PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
+        $GLOBALS['PMA_Config'] = new PMA_Config();
+        $GLOBALS['PMA_Config']->enableBc();
         $this->object = new Image_JPEG_Inline(new PluginManager());
     }
 
diff --git a/test/classes/plugin/transformations/Image_PNG_Inline_test.php b/test/classes/plugin/transformations/Image_PNG_Inline_test.php
index 7029c06e7b..19f2eec43b 100644
--- a/test/classes/plugin/transformations/Image_PNG_Inline_test.php
+++ b/test/classes/plugin/transformations/Image_PNG_Inline_test.php
@@ -13,6 +13,8 @@
 require_once 'libraries/plugins/PluginManager.class.php';
 require_once 'libraries/plugins/transformations/Image_PNG_Inline.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
+require_once 'libraries/Config.class.php';
+require_once 'libraries/config.default.php';
 
 /**
  * Tests for Image_PNG_Inline class
@@ -35,6 +37,8 @@ class Image_PNG_Inline_Test extends PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
+        $GLOBALS['PMA_Config'] = new PMA_Config();
+        $GLOBALS['PMA_Config']->enableBc();
         $this->object = new Image_PNG_Inline(new PluginManager());
     }
 
diff --git a/test/classes/plugin/transformations/Text_Plain_Substring_test.php b/test/classes/plugin/transformations/Text_Plain_Substring_test.php
index 51be484ba2..7038dbd101 100644
--- a/test/classes/plugin/transformations/Text_Plain_Substring_test.php
+++ b/test/classes/plugin/transformations/Text_Plain_Substring_test.php
@@ -13,6 +13,7 @@
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/plugins/PluginManager.class.php';
 require_once 'libraries/plugins/transformations/Text_Plain_Substring.class.php';
+require_once 'libraries/string.inc.php';
 
 /**
  * Tests for Text_Plain_Substring class
diff --git a/test/libraries/PMA_ConfigGenerator_test.php b/test/libraries/PMA_ConfigGenerator_test.php
index 408f6a3056..adb82d689b 100644
--- a/test/libraries/PMA_ConfigGenerator_test.php
+++ b/test/libraries/PMA_ConfigGenerator_test.php
@@ -33,6 +33,8 @@ class PMA_ConfigGenerator_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['AvailableCharsets'] = array();
         unset($_SESSION['eol']);
 
+        $GLOBALS['PMA_Config'] = new PMA_Config();
+
         $GLOBALS['server'] = 0;
         $cf = new ConfigFile();
         $_SESSION['ConfigFile0'] = array('a', 'b', 'c');
diff --git a/test/libraries/PMA_display_change_password_test.php b/test/libraries/PMA_display_change_password_test.php
index d183158ee0..582d985901 100644
--- a/test/libraries/PMA_display_change_password_test.php
+++ b/test/libraries/PMA_display_change_password_test.php
@@ -17,6 +17,8 @@ require_once 'libraries/Theme.class.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/js_escape.lib.php';
+require_once 'libraries/Config.class.php';
+require_once 'libraries/config.default.php';
 
 /**
  * class PMA_DisplayChangePassword_Test
@@ -35,6 +37,8 @@ class PMA_DisplayChangePassword_Test extends PHPUnit_Framework_TestCase
     public function setUp()
     {
         //$GLOBALS
+        $GLOBALS['PMA_Config'] = new PMA_Config();
+        $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['cfg']['MaxRows'] = 10;
         $GLOBALS['cfg']['ServerDefault'] = "PMA_server";
         $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
diff --git a/test/libraries/PMA_mysql_charsets_test.php b/test/libraries/PMA_mysql_charsets_test.php
index 1d3f6cd4ef..638ca049ce 100644
--- a/test/libraries/PMA_mysql_charsets_test.php
+++ b/test/libraries/PMA_mysql_charsets_test.php
@@ -9,7 +9,7 @@
 /*
  * Include to test.
  */
-require_once 'libraries/mysql_charsets.lib.php';
+require_once 'libraries/mysql_charsets.inc.php';
 require_once 'libraries/php-gettext/gettext.inc';
 
 /**
diff --git a/test/libraries/PMA_server_databases_test.php b/test/libraries/PMA_server_databases_test.php
index a279443590..4c59f02ce6 100644
--- a/test/libraries/PMA_server_databases_test.php
+++ b/test/libraries/PMA_server_databases_test.php
@@ -21,6 +21,8 @@ require_once 'libraries/Message.class.php';
 require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
+require_once 'libraries/Config.class.php';
+require_once 'libraries/config.default.php';
 
 /**
  * PMA_ServerDatabases_Test class
@@ -44,6 +46,8 @@ class PMA_ServerDatabases_Test extends PHPUnit_Framework_TestCase
         $_REQUEST['pos'] = 3;
 
         //$GLOBALS
+        $GLOBALS['PMA_Config'] = new PMA_Config();
+        $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['cfg']['MaxRows'] = 10;
         $GLOBALS['cfg']['MaxDbList'] = 100;
         $GLOBALS['cfg']['ServerDefault'] = "server";
diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php
index 0c820c66ef..1551113ce1 100644
--- a/test/libraries/PMA_server_privileges_test.php
+++ b/test/libraries/PMA_server_privileges_test.php
@@ -39,6 +39,11 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
+        //Constants
+        if (!defined("PMA_USR_BROWSER_AGENT")) {
+            define("PMA_USR_BROWSER_AGENT", "other");
+        }
+
         //$_REQUEST
         $_REQUEST['log'] = "index1";
         $_REQUEST['pos'] = 3;
diff --git a/test/libraries/PMA_sql_query_form_test.php b/test/libraries/PMA_sql_query_form_test.php
index 20428bcad5..25170ae240 100644
--- a/test/libraries/PMA_sql_query_form_test.php
+++ b/test/libraries/PMA_sql_query_form_test.php
@@ -24,7 +24,7 @@ require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/sql_query_form.lib.php';
 require_once 'libraries/kanji-encoding.lib.php';
-require_once 'libraries/mysql_charsets.lib.php';
+require_once 'libraries/mysql_charsets.inc.php';
 
 /**
  * class PMA_SqlQueryForm_Test
diff --git a/test/libraries/PMA_tbl_columns_definition_form_test.php b/test/libraries/PMA_tbl_columns_definition_form_test.php
index bfb6a8eca1..35c1b2ce77 100644
--- a/test/libraries/PMA_tbl_columns_definition_form_test.php
+++ b/test/libraries/PMA_tbl_columns_definition_form_test.php
@@ -17,7 +17,7 @@ require_once 'libraries/Types.class.php';
 require_once 'libraries/Theme.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/transformations.lib.php';
-require_once 'libraries/mysql_charsets.lib.php';
+require_once 'libraries/mysql_charsets.inc.php';
 require_once 'libraries/StorageEngine.class.php';
 
 /**