diff --git a/libraries/dbi/DBIDummy.class.php b/libraries/dbi/DBIDummy.class.php
index 0a7d4a5a45..a7809f33a3 100644
--- a/libraries/dbi/DBIDummy.class.php
+++ b/libraries/dbi/DBIDummy.class.php
@@ -255,7 +255,10 @@ $GLOBALS['dummy_queries'] = array(
         'query' => "SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.`SCHEMA_PRIVILEGES` WHERE GRANTEE='''pma_test''@''localhost''' AND PRIVILEGE_TYPE='TRIGGER' AND TABLE_SCHEMA='pma'",
         'result' => array(),
     ),
-
+    array(
+        'query' => "SHOW TABLES FROM `phpmyadmin`",
+        'result' => array(),
+    ),
 );
 /**
  * Current database.
@@ -646,4 +649,4 @@ class PMA_DBI_Dummy implements PMA_DBI_Extension
         return '';
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 3feb88f9b2..3f221ed06d 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit bootstrap="test/bootstrap-dist.php"
-         backupGlobals="false"
+         backupGlobals="true"
          backupStaticAttributes="false"
          strict="true"
          colors="true"
diff --git a/phpunit.xml.nocoverage b/phpunit.xml.nocoverage
index 6f1967a7e1..e58cb2ef5c 100644
--- a/phpunit.xml.nocoverage
+++ b/phpunit.xml.nocoverage
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit bootstrap="test/bootstrap-dist.php"
-         backupGlobals="false"
+         backupGlobals="true"
          backupStaticAttributes="false"
          strict="true"
          colors="true"
diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php
index e008c17c43..67a3b53170 100644
--- a/test/bootstrap-dist.php
+++ b/test/bootstrap-dist.php
@@ -26,4 +26,9 @@ session_start();
 
 // You can put some additional code that should run before tests here
 
+// Standard environment for tests
+$_SESSION[' PMA_token '] = 'token';
+$GLOBALS['lang'] = 'en';
+$GLOBALS['is_ajax_request'] = false;
+
 ?>
diff --git a/test/classes/PMA_Advisor_test.php b/test/classes/PMA_Advisor_test.php
index 5b67035217..a7000bd3d9 100644
--- a/test/classes/PMA_Advisor_test.php
+++ b/test/classes/PMA_Advisor_test.php
@@ -19,8 +19,6 @@ class Advisor_Test extends PHPUnit_Framework_TestCase
 {
     public function setup()
     {
-        $_SESSION[' PMA_token '] = 'token';
-        $GLOBALS['lang'] = 'en';
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
         $GLOBALS['server'] = 0;
         $GLOBALS['cfg']['ServerDefault'] = '';
diff --git a/test/classes/PMA_Config_test.php b/test/classes/PMA_Config_test.php
index 4120e0c426..0546dfbeb9 100644
--- a/test/classes/PMA_Config_test.php
+++ b/test/classes/PMA_Config_test.php
@@ -15,6 +15,8 @@ require_once 'libraries/Config.class.php';
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/Theme.class.php';
 require_once 'libraries/vendor_config.php';
+require_once 'libraries/url_generating.lib.php';
+require_once 'libraries/php-gettext/gettext.inc';
 
 class PMA_ConfigTest extends PHPUnit_Framework_TestCase
 {
@@ -96,7 +98,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
             '<option value="4pt"',
             PMA_Config::getFontsizeForm()
         );
- 
+
         //test getFontsizeOptions for "px" unit
         $_COOKIE['pma_fontsize'] = "10px";
         $this->assertContains(
@@ -117,7 +119,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
         $this->assertContains(
             '<option value="8abc"',
             PMA_Config::getFontsizeForm()
-        );    
+        );
         unset($_COOKIE['pma_fontsize']);
         //rollback the fontsize setting
         $GLOBALS['PMA_Config']->set('fontsize', $fontsize);
@@ -905,6 +907,8 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
     /**
      * Test for Check HTTP
      *
+     * @group medium
+     *
      * @return void
      */
     public function testCheckHTTP()
diff --git a/test/classes/PMA_DBQbe_test.php b/test/classes/PMA_DBQbe_test.php
index fd0a8fc15c..bf68b91a72 100644
--- a/test/classes/PMA_DBQbe_test.php
+++ b/test/classes/PMA_DBQbe_test.php
@@ -232,6 +232,7 @@ class PMA_DBQbe_Test extends PHPUnit_Framework_TestCase
      */
     public function testGetInsDelAndOrCriteriaRows()
     {
+        $GLOBALS['cell_align_right'] = 'cellAlign';
         $this->assertEquals(
             '<tr class="odd noclick"><td class="cellAlign nowrap"><!-- Row controls --><table class="nospacing nopadding"><tr><td class="cellAlign nowrap"><small>Ins:</small><input type="checkbox" name="criteriaRowInsert[0]" /></td><td class="cellAlign"><strong>And:</strong></td><td><input type="radio" name="criteriaAndOrRow[0]" value="and" /></td></tr><tr><td class="cellAlign nowrap"><small>Del:</small><input type="checkbox" name="criteriaRowDelete[0]" /></td><td class="cellAlign"><strong>Or:</strong></td><td><input type="radio" name="criteriaAndOrRow[0]" value="or" checked="checked" /></td></tr></table></td><td class="center"><input type="text" name="Or0[0]" value="" class="textfield" style="width: 12ex" size="20" /></td><td class="center"><input type="text" name="Or0[1]" value="" class="textfield" style="width: 12ex" size="20" /></td><td class="center"><input type="text" name="Or0[2]" value="" class="textfield" style="width: 12ex" size="20" /></td></tr>',
             $this->_callProtectedFunction(
@@ -387,6 +388,12 @@ class PMA_DBQbe_Test extends PHPUnit_Framework_TestCase
      */
     public function testGetFromClause()
     {
+        $_POST['criteriaColumn'] = array(
+            'table1.id',
+            'table1.value',
+            'table1.name',
+            'table1.deleted'
+        );
         $this->assertEquals(
             'table1',
             $this->_callProtectedFunction(
@@ -403,6 +410,12 @@ class PMA_DBQbe_Test extends PHPUnit_Framework_TestCase
      */
     public function testGetSQLQuery()
     {
+        $_POST['criteriaColumn'] = array(
+            'table1.id',
+            'table1.value',
+            'table1.name',
+            'table1.deleted'
+        );
         $this->assertEquals(
             'FROM table1
 ',
diff --git a/test/classes/PMA_DbSearch_test.php b/test/classes/PMA_DbSearch_test.php
index cf29cafe17..f889fb4450 100644
--- a/test/classes/PMA_DbSearch_test.php
+++ b/test/classes/PMA_DbSearch_test.php
@@ -42,10 +42,10 @@ class PMA_DbSearch_Test extends PHPUnit_Framework_TestCase
         $this->object = new PMA_DbSearch('pma_test');
         $GLOBALS['server'] = 0;
         $GLOBALS['cfg']['ServerDefault'] = 1;
-        $GLOBALS['lang'] = 'en';
-        $_SESSION[' PMA_token '] = 'token';
         $GLOBALS['cfg']['MySQLManualType'] = 'viewable';
         $GLOBALS['cfg']['MySQLManualBase'] = 'http://dev.mysql.com/doc/refman';
+        $GLOBALS['cfg']['ShowHint'] = true;
+        $GLOBALS['db'] = 'pma';
     }
 
     /**
@@ -83,8 +83,6 @@ class PMA_DbSearch_Test extends PHPUnit_Framework_TestCase
      */
     public function testGetSearchSqls()
     {
-        $GLOBALS['db'] = 'pma';
-
         $this->assertEquals(
             array (
                 'select_columns' => 'SELECT *  FROM `pma`.`table1` WHERE FALSE',
@@ -166,7 +164,6 @@ class PMA_DbSearch_Test extends PHPUnit_Framework_TestCase
      */
     public function testGetSelectionForm()
     {
-        $_SESSION[' PMA_token '] = 'token';
         $_SESSION['PMA_Theme'] = new PMA_Theme();
         $GLOBALS['pmaThemeImage'] = 'themes/dot.gif';
         $url_params = array('param1', 'param2');
diff --git a/test/classes/PMA_DisplayResults_test.php b/test/classes/PMA_DisplayResults_test.php
index d56f51a704..1ba5f581bd 100644
--- a/test/classes/PMA_DisplayResults_test.php
+++ b/test/classes/PMA_DisplayResults_test.php
@@ -40,8 +40,6 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
         $this->object = new PMA_DisplayResults('as', '', '', '');
         $GLOBALS['PMA_Config'] = new PMA_Config();
         $GLOBALS['PMA_Config']->enableBc();
-        $_SESSION[' PMA_token '] = 'token';
-        $GLOBALS['lang'] = 'en';
         $GLOBALS['server'] = 0;
         $GLOBALS['text_dir'] = 'ltr';
         include_once 'libraries/Response.class.php';
@@ -354,7 +352,6 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
         $caption, $title, $pos, $html_sql_query, $output
     ) {
         $GLOBALS['cfg']['NavigationBarIconic'] = true;
-        $_SESSION[' PMA_token '] = 'token';
 
         $this->assertEquals(
             $output,
diff --git a/test/classes/PMA_Footer_test.php b/test/classes/PMA_Footer_test.php
index efe5ffe3be..199802f1d6 100644
--- a/test/classes/PMA_Footer_test.php
+++ b/test/classes/PMA_Footer_test.php
@@ -16,7 +16,9 @@ require_once 'libraries/core.lib.php';
 require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/Util.class.php';
+require_once 'libraries/Config.class.php';
 require_once 'libraries/Theme.class.php';
+require_once 'libraries/Table.class.php';
 require_once 'libraries/Error_Handler.class.php';
 require_once 'libraries/vendor_config.php';
 
@@ -48,15 +50,18 @@ class PMA_Footer_Test extends PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $_SERVER['SCRIPT_NAME'] = 'index.php';
-        $GLOBALS['db'] = 'mysql';
+        $GLOBALS['PMA_PHP_SELF'] = 'index.php';
+        $GLOBALS['db'] = '';
         $GLOBALS['table'] = '';
-        $GLOBALS['lang'] = 'en';
+        $GLOBALS['text_dir'] = 'ltr';
+        $GLOBALS['PMA_Config'] = new PMA_Config();
+        $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['collation_connection'] = 'utf8_general_ci';
         $GLOBALS['cfg']['Error_Handler']['gather'] = false;
         $GLOBALS['cfg']['Error_Handler']['display'] = false;
         $GLOBALS['cfg']['Server']['verbose'] = 'verbose host';
+        $GLOBALS['cfg']['DefaultTabDatabase'] = 'db_structure.php';
         $GLOBALS['server'] = '1';
-        $_SESSION[' PMA_token '] = 'token';
         $_GET['reload_left_frame'] = '1';
         $GLOBALS['focus_querywindow'] = 'main_pane_left';
         $this->object = new PMA_Footer();
@@ -138,7 +143,7 @@ class PMA_Footer_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['ServerDefault'] = 1;
 
         $this->assertEquals(
-            '<div id="selflink" class="print_ignore"><a href="index.php?db=mysql&amp;table=&amp;server=1&amp;target=&amp;lang=en&amp;collation_connection=utf8_general_ci&amp;token=token" title="Open new phpMyAdmin window" target="_blank">Open new phpMyAdmin window</a></div>',
+            '<div id="selflink" class="print_ignore"><a href="index.php?db=&amp;table=&amp;server=1&amp;target=&amp;lang=en&amp;collation_connection=utf8_general_ci&amp;token=token" title="Open new phpMyAdmin window" target="_blank">Open new phpMyAdmin window</a></div>',
             $this->_callPrivateFunction(
                 '_getSelfLink',
                 array(
@@ -162,7 +167,7 @@ class PMA_Footer_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['pmaThemeImage'] = 'image';
 
         $this->assertEquals(
-            '<div id="selflink" class="print_ignore"><a href="index.php?db=mysql&amp;table=&amp;server=1&amp;target=&amp;lang=en&amp;collation_connection=utf8_general_ci&amp;token=token" title="Open new phpMyAdmin window" target="_blank"><img src="imagewindow-new.png" title="Open new phpMyAdmin window" alt="Open new phpMyAdmin window" /></a></div>',
+            '<div id="selflink" class="print_ignore"><a href="index.php?db=&amp;table=&amp;server=1&amp;target=&amp;lang=en&amp;collation_connection=utf8_general_ci&amp;token=token" title="Open new phpMyAdmin window" target="_blank"><img src="imagewindow-new.png" title="Open new phpMyAdmin window" alt="Open new phpMyAdmin window" /></a></div>',
             $this->_callPrivateFunction(
                 '_getSelfLink',
                 array(
@@ -201,7 +206,7 @@ class PMA_Footer_Test extends PHPUnit_Framework_TestCase
             $footer->getDisplay()
         );
     }
-    
+
     /**
      * Test for footer get Scripts
      *
diff --git a/test/classes/PMA_Header_test.php b/test/classes/PMA_Header_test.php
index 64a5af057f..c77e8c5d23 100644
--- a/test/classes/PMA_Header_test.php
+++ b/test/classes/PMA_Header_test.php
@@ -42,8 +42,6 @@ class PMA_Header_Test extends PHPUnit_Framework_TestCase
             define('PMA_IS_WINDOWS', false);
         }
         $GLOBALS['server'] = 0;
-        $GLOBALS['lang'] = 'en';
-        $_SESSION[' PMA_token '] = 'token';
         $GLOBALS['message'] = 'phpmyadminmessage';
         $GLOBALS['is_ajax_request'] = false;
         $_SESSION['PMA_Theme'] = new PMA_Theme();
diff --git a/test/classes/PMA_Menu_test.php b/test/classes/PMA_Menu_test.php
index aa07a75fc5..7fa7265214 100644
--- a/test/classes/PMA_Menu_test.php
+++ b/test/classes/PMA_Menu_test.php
@@ -42,7 +42,6 @@ class PMA_Menu_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
         $GLOBALS['server'] = 0;
         $GLOBALS['cfg']['ServerDefault'] = 1;
-        $GLOBALS['lang'] = 'en';
         $GLOBALS['cfg']['Server']['verbose'] = 'verbose host';
         $GLOBALS['cfg']['NavigationBarIconic'] = 'both';
         $_SESSION['PMA_Theme'] = new PMA_Theme();
diff --git a/test/classes/PMA_Message_test.php b/test/classes/PMA_Message_test.php
index deb1306edb..60912aac54 100644
--- a/test/classes/PMA_Message_test.php
+++ b/test/classes/PMA_Message_test.php
@@ -14,6 +14,7 @@ require_once 'libraries/core.lib.php';
 require_once 'libraries/Util.class.php';
 require_once 'libraries/Message.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
+require_once 'libraries/Theme.class.php';
 
 class PMA_Message_Test extends PHPUnit_Framework_TestCase
 {
@@ -33,6 +34,8 @@ class PMA_Message_Test extends PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->object = new PMA_Message;
+        $_SESSION['PMA_Theme'] = new PMA_Theme();
+        $GLOBALS['pmaThemeImage'] = 'theme/';
     }
 
     /**
@@ -367,8 +370,6 @@ class PMA_Message_Test extends PHPUnit_Framework_TestCase
 
     public function testDecodeBB($actual, $expected)
     {
-        $GLOBALS['lang'] = 'en';
-        $_SESSION[' PMA_token '] = 'token';
         unset($GLOBALS['server']);
         unset($GLOBALS['collation_connection']);
         $this->assertEquals($expected, PMA_Message::decodeBB($actual));
diff --git a/test/classes/PMA_Table_test.php b/test/classes/PMA_Table_test.php
index 1e36a79bd5..a1ced5cca3 100644
--- a/test/classes/PMA_Table_test.php
+++ b/test/classes/PMA_Table_test.php
@@ -36,8 +36,6 @@ class PMA_Table_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['server'] = 0;
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
         $GLOBALS['cfg']['ServerDefault'] = 1;
-        $GLOBALS['lang'] = 'en';
-        $_SESSION[' PMA_token '] = 'token';
         $GLOBALS['cfg']['MySQLManualType'] = 'viewable';
         $GLOBALS['cfg']['MySQLManualBase'] = 'http://dev.mysql.com/doc/refman';
         $GLOBALS['cfg']['PropertiesIconic'] = 'both';
diff --git a/test/classes/PMA_Theme_Manager_test.php b/test/classes/PMA_Theme_Manager_test.php
index a726ff41ab..71d8d2d6c2 100644
--- a/test/classes/PMA_Theme_Manager_test.php
+++ b/test/classes/PMA_Theme_Manager_test.php
@@ -26,8 +26,6 @@ class PMA_Theme_Manager_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['ThemeDefault'] = 'pmahomme';
         $GLOBALS['cfg']['ServerDefault'] = 0;
         $GLOBALS['server'] = 99;
-        $GLOBALS['lang'] = 'en';
-        $_SESSION[' PMA_token '] = 'token';
         $GLOBALS['PMA_Config'] = new PMA_Config();
         $GLOBALS['collation_connection'] = 'utf8_general_ci';
     }
diff --git a/test/classes/PMA_Theme_test.php b/test/classes/PMA_Theme_test.php
index 8c3b91ee32..7d8d2c7821 100644
--- a/test/classes/PMA_Theme_test.php
+++ b/test/classes/PMA_Theme_test.php
@@ -37,8 +37,6 @@ class PMA_ThemeTest extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['SQP']['fmtColor'] = array('fake' => 'red');
         $GLOBALS['text_dir'] = 'ltr';
         include 'themes/pmahomme/layout.inc.php';
-        $_SESSION[' PMA_token '] = 'token';
-        $GLOBALS['lang'] = 'en';
         $GLOBALS['server'] = '99';
     }
 
diff --git a/test/classes/config/PMA_Form_test.php b/test/classes/config/PMA_Form_test.php
index 4cb107e0c1..4cf9bdaff9 100644
--- a/test/classes/config/PMA_Form_test.php
+++ b/test/classes/config/PMA_Form_test.php
@@ -9,6 +9,7 @@
 require_once 'libraries/config/ConfigFile.class.php';
 require_once 'libraries/config/Form.class.php';
 require_once 'libraries/Util.class.php';
+require_once 'libraries/php-gettext/gettext.inc';
 
 
 class PMA_Form_Test extends PHPUnit_Framework_TestCase
diff --git a/test/libraries/PMA_SQL_parser_test.php b/test/libraries/PMA_SQL_parser_test.php
index 25f32926d2..f8a78ceb4a 100644
--- a/test/libraries/PMA_SQL_parser_test.php
+++ b/test/libraries/PMA_SQL_parser_test.php
@@ -10,6 +10,11 @@
  * Include to test.
  */
 require_once 'libraries/sqlparser.lib.php';
+require_once 'libraries/php-gettext/gettext.inc';
+require_once 'libraries/Message.class.php';
+require_once 'libraries/Util.class.php';
+require_once 'libraries/Theme.class.php';
+require_once 'libraries/sanitizing.lib.php';
 
 class PMA_SQLParser_Test extends PHPUnit_Framework_TestCase
 {
@@ -23,6 +28,8 @@ class PMA_SQLParser_Test extends PHPUnit_Framework_TestCase
         if (function_exists('mb_internal_encoding')) {
             mb_internal_encoding('utf-8');
         }
+        $_SESSION['PMA_Theme'] = new PMA_Theme();
+        $GLOBALS['pmaThemeImage'] = 'theme/';
     }
 
     /**
@@ -40,8 +47,9 @@ class PMA_SQLParser_Test extends PHPUnit_Framework_TestCase
     public function testParser($sql, $expected, $error = '')
     {
         PMA_SQP_resetError();
+        $this->expectOutputString($error);
         $parsed_sql = PMA_SQP_parse($sql);
-        $this->assertEquals($error, PMA_SQP_getErrorString());
+        $this->assertEquals('', PMA_SQP_getErrorString());
         $this->assertEquals($expected, $parsed_sql);
     }
 
@@ -177,7 +185,8 @@ class PMA_SQLParser_Test extends PHPUnit_Framework_TestCase
                         'pos' => 0,
                     ),
                     'len' => 5,
-                )
+                ),
+                '<div class="notice"><img src="theme/s_notice.png" title="" alt="" /> Automatically appended backtick to the end of query!</div>'
             ),
             array(
                 'SELECT * FROM `a_table` tbla INNER JOIN b_table` tblb ON tblb.id = tbla.id WHERE tblb.field1 != tbla.field1`;',
diff --git a/test/libraries/PMA_build_html_for_db_test.php b/test/libraries/PMA_build_html_for_db_test.php
index 44428c64af..0e22034a66 100644
--- a/test/libraries/PMA_build_html_for_db_test.php
+++ b/test/libraries/PMA_build_html_for_db_test.php
@@ -35,8 +35,6 @@ class PMA_BuildHtmlForDb_Test extends PHPUnit_Framework_TestCase
         $cfg['ShowFunctionFields'] = false;
         $GLOBALS['server'] = 0;
         $cfg['ServerDefault'] = 1;
-        $GLOBALS['lang'] = 'en';
-        $_SESSION[' PMA_token '] = 'token';
         $cfg['MySQLManualType'] = 'viewable';
         $cfg['MySQLManualBase'] = 'http://dev.mysql.com/doc/refman';
 
@@ -47,7 +45,6 @@ class PMA_BuildHtmlForDb_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
         $GLOBALS['pmaThemeImage'] = 'theme/';
 
-        $_SESSION[' PMA_token '] = 'token';
 
         $GLOBALS['cfg']['DefaultTabDatabase'] = 'db_structure.php';
     }
diff --git a/test/libraries/PMA_generateCommonUrl_test.php b/test/libraries/PMA_generateCommonUrl_test.php
index 5bb2f73f1d..1ae056e479 100644
--- a/test/libraries/PMA_generateCommonUrl_test.php
+++ b/test/libraries/PMA_generateCommonUrl_test.php
@@ -22,16 +22,14 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
     public function testOldStyle()
     {
         $GLOBALS['server'] = 'x';
-        $GLOBALS['lang'] = 'x';
         $GLOBALS['collation_connection'] = 'x';
-        $_SESSION[' PMA_token '] = 'x';
         $GLOBALS['cfg']['ServerDefault'] = 'y';
 
         $separator = PMA_get_arg_separator();
         $expected = 'server=x' . htmlentities($separator)
-            . 'lang=x' . htmlentities($separator)
+            . 'lang=en' . htmlentities($separator)
             . 'collation_connection=x' . htmlentities($separator)
-            . 'token=x'
+            . 'token=token'
             ;
 
         $expected = 'db=db'
@@ -44,16 +42,14 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
     public function testOldStyleDbOnly()
     {
         $GLOBALS['server'] = 'x';
-        $GLOBALS['lang'] = 'x';
         $GLOBALS['collation_connection'] = 'x';
-        $_SESSION[' PMA_token '] = 'x';
         $GLOBALS['cfg']['ServerDefault'] = 'y';
 
         $separator = PMA_get_arg_separator();
         $expected = 'server=x' . htmlentities($separator)
-            . 'lang=x' . htmlentities($separator)
+            . 'lang=en' . htmlentities($separator)
             . 'collation_connection=x' . htmlentities($separator)
-            . 'token=x'
+            . 'token=token'
             ;
 
         $expected = 'db=db'
@@ -65,16 +61,14 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
     public function testNewStyle()
     {
         $GLOBALS['server'] = 'x';
-        $GLOBALS['lang'] = 'x';
         $GLOBALS['collation_connection'] = 'x';
-        $_SESSION[' PMA_token '] = 'x';
         $GLOBALS['cfg']['ServerDefault'] = 'y';
 
         $separator = PMA_get_arg_separator();
         $expected = 'server=x' . htmlentities($separator)
-            . 'lang=x' . htmlentities($separator)
+            . 'lang=en' . htmlentities($separator)
             . 'collation_connection=x' . htmlentities($separator)
-            . 'token=x'
+            . 'token=token'
             ;
 
         $expected = '?db=db'
@@ -87,16 +81,14 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
     public function testOldStyleWithAlternateSeparator()
     {
         $GLOBALS['server'] = 'x';
-        $GLOBALS['lang'] = 'x';
         $GLOBALS['collation_connection'] = 'x';
-        $_SESSION[' PMA_token '] = 'x';
         $GLOBALS['cfg']['ServerDefault'] = 'y';
 
         $separator = PMA_get_arg_separator();
         $expected = 'server=x' . $separator
-            . 'lang=x' . $separator
+            . 'lang=en' . $separator
             . 'collation_connection=x' . $separator
-            . 'token=x'
+            . 'token=token'
             ;
 
         $expected = 'db=db' . $separator . 'table=table' . $separator . $expected;
@@ -106,16 +98,14 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
     public function testOldStyleWithAlternateSeparatorDbOnly()
     {
         $GLOBALS['server'] = 'x';
-        $GLOBALS['lang'] = 'x';
         $GLOBALS['collation_connection'] = 'x';
-        $_SESSION[' PMA_token '] = 'x';
         $GLOBALS['cfg']['ServerDefault'] = 'y';
 
         $separator = PMA_get_arg_separator();
         $expected = 'server=x' . $separator
-            . 'lang=x' . $separator
+            . 'lang=en' . $separator
             . 'collation_connection=x' . $separator
-            . 'token=x'
+            . 'token=token'
             ;
 
         $expected = 'db=db' . $separator . $expected;
@@ -125,16 +115,14 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
     public function testDefault()
     {
         $GLOBALS['server'] = 'x';
-        $GLOBALS['lang'] = 'x';
         $GLOBALS['collation_connection'] = 'x';
-        $_SESSION[' PMA_token '] = 'x';
         $GLOBALS['cfg']['ServerDefault'] = 'y';
 
         $separator = PMA_get_arg_separator();
         $expected = 'server=x' . htmlentities($separator)
-            . 'lang=x' . htmlentities($separator)
+            . 'lang=en' . htmlentities($separator)
             . 'collation_connection=x' . htmlentities($separator)
-            . 'token=x'
+            . 'token=token'
             ;
         $this->assertEquals($expected, PMA_generate_common_url());
     }
diff --git a/test/libraries/PMA_operations_test.php b/test/libraries/PMA_operations_test.php
index 4ae570959a..7322ecf1b6 100644
--- a/test/libraries/PMA_operations_test.php
+++ b/test/libraries/PMA_operations_test.php
@@ -38,7 +38,6 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['table'] = 'table';
         $GLOBALS['db'] = 'db';
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
-        $_SESSION[' PMA_token '] = 'token';
         $GLOBALS['cfg'] = array(
             'MySQLManualType' => 'none',
             'ServerDefault' => 1,
diff --git a/test/libraries/PMA_sanitize_test.php b/test/libraries/PMA_sanitize_test.php
index 14de225fdf..24e3b39067 100644
--- a/test/libraries/PMA_sanitize_test.php
+++ b/test/libraries/PMA_sanitize_test.php
@@ -23,7 +23,6 @@ class PMA_Sanitize_Test extends PHPUnit_Framework_TestCase
      */
     function setUp()
     {
-        $_SESSION[' PMA_token '] = 'token';
     }
 
     /**
diff --git a/test/libraries/PMA_transformation_test.php b/test/libraries/PMA_transformation_test.php
index 87d87bf58a..f9ab9b6db5 100644
--- a/test/libraries/PMA_transformation_test.php
+++ b/test/libraries/PMA_transformation_test.php
@@ -34,7 +34,6 @@ class PMA_Transformation_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['table'] = 'table';
         $GLOBALS['db'] = 'db';
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
-        $_SESSION[' PMA_token '] = 'token';
         $GLOBALS['cfg'] = array(
             'MySQLManualType' => 'none',
             'ServerDefault' => 1,
diff --git a/test/libraries/common/PMA_checkParameters_test.php b/test/libraries/common/PMA_checkParameters_test.php
index 8e8a70fbf4..e9c612e49b 100644
--- a/test/libraries/common/PMA_checkParameters_test.php
+++ b/test/libraries/common/PMA_checkParameters_test.php
@@ -24,7 +24,6 @@ class PMA_CheckParameters_Test extends PHPUnit_Framework_TestCase
         $_SESSION['PMA_Theme'] = new PMA_Theme();
         $GLOBALS['cfg'] = array('ServerDefault' => 1);
         $GLOBALS['pmaThemeImage'] = 'theme/';
-        $GLOBALS['lang'] = 'en';
         $GLOBALS['text_dir'] = 'ltr';
     }
 
diff --git a/test/libraries/common/PMA_getDbLink_test.php b/test/libraries/common/PMA_getDbLink_test.php
index 54731795e4..401dc1d80e 100644
--- a/test/libraries/common/PMA_getDbLink_test.php
+++ b/test/libraries/common/PMA_getDbLink_test.php
@@ -22,8 +22,6 @@ class PMA_GetDbLink_Test extends PHPUnit_Framework_TestCase
         global $cfg;
         include_once 'libraries/vendor_config.php';
         include 'libraries/config.default.php';
-        $_SESSION[' PMA_token '] = 'token';
-        $GLOBALS['lang'] = 'en';
         $GLOBALS['server'] = 99;
     }
 
diff --git a/test/libraries/common/PMA_showDocu_test.php b/test/libraries/common/PMA_showDocu_test.php
index d3d0b35bf3..35ab1dfe15 100644
--- a/test/libraries/common/PMA_showDocu_test.php
+++ b/test/libraries/common/PMA_showDocu_test.php
@@ -19,8 +19,6 @@ class PMA_ShowDocu_Test extends PHPUnit_Framework_TestCase
     function setup()
     {
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
-        $_SESSION[' PMA_token '] = 'token';
-        $GLOBALS['lang'] = 'en';
         $GLOBALS['server'] = '99';
         $GLOBALS['cfg']['ServerDefault'] = 1;
     }
diff --git a/test/libraries/common/PMA_showMessage_test_disabled.php b/test/libraries/common/PMA_showMessage_test_disabled.php
index e114770078..db89e20dd2 100644
--- a/test/libraries/common/PMA_showMessage_test_disabled.php
+++ b/test/libraries/common/PMA_showMessage_test_disabled.php
@@ -37,7 +37,6 @@ class PMA_ShowMessage_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['table'] = 'tbl';
         $GLOBALS['db'] = 'db';
 
-        $_SESSION[' PMA_token '] = md5(uniqid(rand(), true));
 
         $GLOBALS['sql_query'] = "SELECT * FROM tblPatient ";
 
diff --git a/test/libraries/common/PMA_showPHPDocu_test.php b/test/libraries/common/PMA_showPHPDocu_test.php
index 0767808032..2a0be3568a 100644
--- a/test/libraries/common/PMA_showPHPDocu_test.php
+++ b/test/libraries/common/PMA_showPHPDocu_test.php
@@ -20,8 +20,6 @@ class PMA_ShowPHPDocu_Test extends PHPUnit_Framework_TestCase
     function setup()
     {
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
-        $_SESSION[' PMA_token '] = 'token';
-        $GLOBALS['lang'] = 'en';
         $GLOBALS['server'] = 99;
         $GLOBALS['cfg']['ServerDefault'] = 0;
     }
diff --git a/test/libraries/core/PMA_fatalError_test.php b/test/libraries/core/PMA_fatalError_test.php
index f7343ddadb..9fa44e689e 100644
--- a/test/libraries/core/PMA_fatalError_test.php
+++ b/test/libraries/core/PMA_fatalError_test.php
@@ -37,7 +37,6 @@ class PMA_FatalError_Test extends PHPUnit_Framework_TestCase
         );
         $GLOBALS['cfg']['OBGzip'] = false;
         $_SESSION['PMA_Theme'] = new PMA_Theme();
-        $_SESSION[' PMA_token '] = 'token';
         $GLOBALS['pmaThemeImage'] = 'theme/';
         $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
         $GLOBALS['server'] = 1;
diff --git a/test/libraries/core/PMA_getLinks_test.php b/test/libraries/core/PMA_getLinks_test.php
index b7551c101f..b13afeb562 100644
--- a/test/libraries/core/PMA_getLinks_test.php
+++ b/test/libraries/core/PMA_getLinks_test.php
@@ -17,8 +17,6 @@ class PMA_GetLinks_Test extends PHPUnit_Framework_TestCase
 {
     function setUp()
     {
-        $_SESSION[' PMA_token '] = 'token';
-        $GLOBALS['lang'] = 'en';
         $GLOBALS['server'] = 99;
         $GLOBALS['cfg']['ServerDefault'] = 0;
     }
diff --git a/test/libraries/core/PMA_getTableCount_test_dis.php b/test/libraries/core/PMA_getTableCount_test_dis.php
index 51be938320..97dd04c9aa 100644
--- a/test/libraries/core/PMA_getTableCount_test_dis.php
+++ b/test/libraries/core/PMA_getTableCount_test_dis.php
@@ -43,7 +43,6 @@ class PMA_GetTableCount_Test extends PHPUnit_Framework_TestCase
 //        );
         $GLOBALS['cfg']['OBGzip'] = false;
         $_SESSION['PMA_Theme'] = new PMA_Theme();
-        $_SESSION[' PMA_token '] = 'token';
         $GLOBALS['pmaThemeImage'] = 'theme/';
         $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
         $GLOBALS['server'] = 1;
diff --git a/test/libraries/core/PMA_headerLocation_test.php b/test/libraries/core/PMA_headerLocation_test.php
index 093c745cb3..61069caf6f 100644
--- a/test/libraries/core/PMA_headerLocation_test.php
+++ b/test/libraries/core/PMA_headerLocation_test.php
@@ -177,8 +177,6 @@ class PMA_HeaderLocation_Test extends PHPUnit_Framework_TestCase
             }
 
         }
-        $_SESSION[' PMA_token '] = 'token';
-        $GLOBALS['lang'] = 'en';
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
         $GLOBALS['server'] = 0;
         $GLOBALS['PMA_Config'] = new PMA_Config();
diff --git a/test/libraries/core/PMA_warnMissingExtension_test.php b/test/libraries/core/PMA_warnMissingExtension_test.php
index 4858516ed7..b8bcc42d0d 100644
--- a/test/libraries/core/PMA_warnMissingExtension_test.php
+++ b/test/libraries/core/PMA_warnMissingExtension_test.php
@@ -23,7 +23,6 @@ class PMA_WarnMissingExtension_Test extends PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        $GLOBALS['lang'] = 'en';
         $GLOBALS['PMA_Config'] = new PMA_Config();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['cfg']['Server'] = array(
@@ -32,7 +31,6 @@ class PMA_WarnMissingExtension_Test extends PHPUnit_Framework_TestCase
         );
         $GLOBALS['cfg']['OBGzip'] = false;
         $_SESSION['PMA_Theme'] = new PMA_Theme();
-        $_SESSION[' PMA_token '] = 'token';
         $GLOBALS['pmaThemeImage'] = 'theme/';
         $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
         $GLOBALS['server'] = 1;
diff --git a/test/libraries/database_interface_test.php b/test/libraries/database_interface_test.php
index 48912e8337..3d7da15819 100644
--- a/test/libraries/database_interface_test.php
+++ b/test/libraries/database_interface_test.php
@@ -51,7 +51,8 @@ class PMA_DBI_Test extends PHPUnit_Framework_TestCase
      */
     function testFetch()
     {
-        $this->assertEquals(array('1'), $GLOBALS['dbi']->fetchArray(0));
+        $result = $GLOBALS['dbi']->tryQuery('SELECT 1');
+        $this->assertEquals(array('1'), $GLOBALS['dbi']->fetchArray($result));
     }
 
     /**
diff --git a/test/libraries/rte/PMA_EVN_getEditorForm_test.php b/test/libraries/rte/PMA_EVN_getEditorForm_test.php
index 631b89d031..3d3e9692f7 100644
--- a/test/libraries/rte/PMA_EVN_getEditorForm_test.php
+++ b/test/libraries/rte/PMA_EVN_getEditorForm_test.php
@@ -17,12 +17,7 @@ class PMA_EVN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        $GLOBALS['tear_down']['token'] = false;
         $GLOBALS['tear_down']['server'] = false;
-        if (! isset($_SESSION[' PMA_token '])) {
-            $_SESSION[' PMA_token '] = '';
-            $GLOBALS['tear_down']['token'] = true;
-        }
         if (! isset($GLOBALS['cfg']['ServerDefault'])) {
             $GLOBALS['cfg']['ServerDefault'] = '';
             $GLOBALS['tear_down']['server'] = true;
@@ -31,9 +26,6 @@ class PMA_EVN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
 
     public function tearDown()
     {
-        if ($GLOBALS['tear_down']['token']) {
-            unset($_SESSION[' PMA_token ']);
-        }
         if ($GLOBALS['tear_down']['server']) {
             unset($GLOBALS['cfg']['ServerDefault']);
         }
diff --git a/test/libraries/rte/PMA_RTN_getEditorForm_test.php b/test/libraries/rte/PMA_RTN_getEditorForm_test.php
index 90f92ff0b8..567ccd5b4c 100644
--- a/test/libraries/rte/PMA_RTN_getEditorForm_test.php
+++ b/test/libraries/rte/PMA_RTN_getEditorForm_test.php
@@ -28,8 +28,6 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
         $cfg['ShowFunctionFields'] = false;
         $GLOBALS['server'] = 0;
         $cfg['ServerDefault'] = 1;
-        $GLOBALS['lang'] = 'en';
-        $_SESSION[' PMA_token '] = 'token';
         $cfg['MySQLManualType'] = 'viewable';
         $cfg['MySQLManualBase'] = 'http://dev.mysql.com/doc/refman';
 
@@ -38,7 +36,6 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
         $GLOBALS['pmaThemeImage'] = 'theme/';
 
-        $_SESSION[' PMA_token '] = 'token';
     }
 
     public function testgetParameterRow_empty()
diff --git a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
index c24f5458f3..1e2f26d0f5 100644
--- a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
+++ b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
@@ -26,8 +26,6 @@ class PMA_RTN_GetExecuteForm_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['PMA_Types'] = new PMA_Types_MySQL();
         $GLOBALS['server'] = 0;
         $cfg['ServerDefault'] = 1;
-        $GLOBALS['lang'] = 'en';
-        $_SESSION[' PMA_token '] = 'token';
         $GLOBALS['cfg']['ServerDefault'] = '';
         $cfg['ShowFunctionFields'] = true;
         $cfg['DefaultFunctions']['FUNC_NUMBER'] = '';
diff --git a/test/libraries/rte/PMA_TRI_getEditorForm_test.php b/test/libraries/rte/PMA_TRI_getEditorForm_test.php
index 062ed6bf2a..f4fd916dc3 100644
--- a/test/libraries/rte/PMA_TRI_getEditorForm_test.php
+++ b/test/libraries/rte/PMA_TRI_getEditorForm_test.php
@@ -19,7 +19,6 @@ class PMA_TRI_GetEditorForm_Test extends PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        $_SESSION[' PMA_token '] = 'token';
         $GLOBALS['cfg']['ServerDefault'] = '';
         $GLOBALS['db'] = 'pma_test';
     }