diff --git a/test/classes/navigation/PMA_Node_Database_test.php b/test/classes/navigation/PMA_Node_Database_test.php
index 792a1c4b30..b21cb1da3c 100644
--- a/test/classes/navigation/PMA_Node_Database_test.php
+++ b/test/classes/navigation/PMA_Node_Database_test.php
@@ -17,6 +17,11 @@ require_once 'libraries/Theme.class.php';
  */
 class Node_Database_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * SetUp for test cases
+     * 
+     * @return void
+     */
     public function setup()
     {
         $GLOBALS['server'] = 0;
@@ -24,6 +29,11 @@ class Node_Database_Test extends PHPUnit_Framework_TestCase
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
     }
 
+    /**
+     * Test for __construct
+     * 
+     * @return void
+     */
     public function testConstructor()
     {
         $parent = PMA_NodeFactory::getInstance('Node_Database');
diff --git a/test/classes/navigation/PMA_Node_Event_Container_test.php b/test/classes/navigation/PMA_Node_Event_Container_test.php
index 7dda61a99c..0ae76cb120 100644
--- a/test/classes/navigation/PMA_Node_Event_Container_test.php
+++ b/test/classes/navigation/PMA_Node_Event_Container_test.php
@@ -17,6 +17,11 @@ require_once 'libraries/Theme.class.php';
  */
 class Node_Event_Container_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * SetUp for test cases
+     * 
+     * @return void
+     */
     public function setup()
     {
         $GLOBALS['server'] = 0;
@@ -24,6 +29,11 @@ class Node_Event_Container_Test extends PHPUnit_Framework_TestCase
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
     }
 
+    /**
+     * Test for __construct
+     * 
+     * @return void
+     */
     public function testConstructor()
     {
         $parent = PMA_NodeFactory::getInstance('Node_Event_Container');
diff --git a/test/classes/navigation/PMA_Node_Event_test.php b/test/classes/navigation/PMA_Node_Event_test.php
index 40f7561a45..ff89cc688b 100644
--- a/test/classes/navigation/PMA_Node_Event_test.php
+++ b/test/classes/navigation/PMA_Node_Event_test.php
@@ -17,6 +17,11 @@ require_once 'libraries/Theme.class.php';
  */
 class Node_Event_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * SetUp for test cases
+     * 
+     * @return void
+     */
     public function setup()
     {
         $GLOBALS['server'] = 0;
@@ -24,6 +29,11 @@ class Node_Event_Test extends PHPUnit_Framework_TestCase
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
     }
 
+    /**
+     * Test for __construct
+     * 
+     * @return void
+     */
     public function testConstructor()
     {
         $parent = PMA_NodeFactory::getInstance('Node_Event');
diff --git a/test/classes/navigation/PMA_Node_Function_Container_test.php b/test/classes/navigation/PMA_Node_Function_Container_test.php
index f092810aad..eeec930968 100644
--- a/test/classes/navigation/PMA_Node_Function_Container_test.php
+++ b/test/classes/navigation/PMA_Node_Function_Container_test.php
@@ -17,6 +17,11 @@ require_once 'libraries/Theme.class.php';
  */
 class Node_Function_Container_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * SetUp for test cases
+     * 
+     * @return void
+     */
     public function setup()
     {
         $GLOBALS['server'] = 0;
@@ -24,6 +29,11 @@ class Node_Function_Container_Test extends PHPUnit_Framework_TestCase
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
     }
 
+    /**
+     * Test for __construct
+     * 
+     * @return void
+     */
     public function testConstructor()
     {
         $parent = PMA_NodeFactory::getInstance('Node_Function_Container');
diff --git a/test/classes/navigation/PMA_Node_Function_test.php b/test/classes/navigation/PMA_Node_Function_test.php
index 5f73ccf31b..95221a18ec 100644
--- a/test/classes/navigation/PMA_Node_Function_test.php
+++ b/test/classes/navigation/PMA_Node_Function_test.php
@@ -17,6 +17,11 @@ require_once 'libraries/Theme.class.php';
  */
 class Node_Function_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * SetUp for test cases
+     * 
+     * @return void
+     */
     public function setup()
     {
         $GLOBALS['server'] = 0;
@@ -24,6 +29,11 @@ class Node_Function_Test extends PHPUnit_Framework_TestCase
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
     }
 
+    /**
+     * Test for __construct
+     * 
+     * @return void
+     */
     public function testConstructor()
     {
         $parent = PMA_NodeFactory::getInstance('Node_Function');
diff --git a/test/classes/navigation/PMA_Node_Index_Container_test.php b/test/classes/navigation/PMA_Node_Index_Container_test.php
index c69ba43574..73529ad30f 100644
--- a/test/classes/navigation/PMA_Node_Index_Container_test.php
+++ b/test/classes/navigation/PMA_Node_Index_Container_test.php
@@ -17,6 +17,11 @@ require_once 'libraries/Theme.class.php';
  */
 class Node_Index_Container_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * SetUp for test cases
+     * 
+     * @return void
+     */
     public function setup()
     {
         $GLOBALS['server'] = 0;
@@ -24,6 +29,11 @@ class Node_Index_Container_Test extends PHPUnit_Framework_TestCase
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
     }
 
+    /**
+     * Test for __construct
+     * 
+     * @return void
+     */
     public function testConstructor()
     {
         $parent = PMA_NodeFactory::getInstance('Node_Index_Container');
diff --git a/test/classes/navigation/PMA_Node_Index_test.php b/test/classes/navigation/PMA_Node_Index_test.php
index 25c07cb1b7..bce85e9158 100644
--- a/test/classes/navigation/PMA_Node_Index_test.php
+++ b/test/classes/navigation/PMA_Node_Index_test.php
@@ -17,6 +17,11 @@ require_once 'libraries/Theme.class.php';
  */
 class Node_Index_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * SetUp for test cases
+     * 
+     * @return void
+     */
     public function setup()
     {
         $GLOBALS['server'] = 0;
@@ -24,6 +29,11 @@ class Node_Index_Test extends PHPUnit_Framework_TestCase
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
     }
 
+    /**
+     * Test for __construct
+     * 
+     * @return void
+     */
     public function testConstructor()
     {
         $parent = PMA_NodeFactory::getInstance('Node_Index');
diff --git a/test/classes/navigation/PMA_Node_Procedure_Container_test.php b/test/classes/navigation/PMA_Node_Procedure_Container_test.php
index 06531314bc..59e671a7e8 100644
--- a/test/classes/navigation/PMA_Node_Procedure_Container_test.php
+++ b/test/classes/navigation/PMA_Node_Procedure_Container_test.php
@@ -17,6 +17,11 @@ require_once 'libraries/Theme.class.php';
  */
 class Node_Procedure_Container_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * SetUp for test cases
+     * 
+     * @return void
+     */
     public function setup()
     {
         $GLOBALS['server'] = 0;
@@ -24,6 +29,11 @@ class Node_Procedure_Container_Test extends PHPUnit_Framework_TestCase
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
     }
 
+    /**
+     * Test for __construct
+     * 
+     * @return void
+     */
     public function testConstructor()
     {
         $parent = PMA_NodeFactory::getInstance('Node_Procedure_Container');
diff --git a/test/classes/navigation/PMA_Node_Procedure_test.php b/test/classes/navigation/PMA_Node_Procedure_test.php
index a2847ba6dd..fc35a931e0 100644
--- a/test/classes/navigation/PMA_Node_Procedure_test.php
+++ b/test/classes/navigation/PMA_Node_Procedure_test.php
@@ -17,6 +17,11 @@ require_once 'libraries/Theme.class.php';
  */
 class Node_Procedure_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * SetUp for test cases
+     * 
+     * @return void
+     */
     public function setup()
     {
         $GLOBALS['server'] = 0;
@@ -24,6 +29,11 @@ class Node_Procedure_Test extends PHPUnit_Framework_TestCase
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
     }
 
+    /**
+     * Test for __construct
+     * 
+     * @return void
+     */
     public function testConstructor()
     {
         $parent = PMA_NodeFactory::getInstance('Node_Procedure');
diff --git a/test/classes/navigation/PMA_Node_Table_Container_test.php b/test/classes/navigation/PMA_Node_Table_Container_test.php
index 4b14b9ddc0..9a091e2767 100644
--- a/test/classes/navigation/PMA_Node_Table_Container_test.php
+++ b/test/classes/navigation/PMA_Node_Table_Container_test.php
@@ -17,6 +17,11 @@ require_once 'libraries/Theme.class.php';
  */
 class Node_Table_Container_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * SetUp for test cases
+     * 
+     * @return void
+     */
     public function setup()
     {
         $GLOBALS['server'] = 0;
@@ -24,6 +29,12 @@ class Node_Table_Container_Test extends PHPUnit_Framework_TestCase
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
     }
 
+
+    /**
+     * Test for __construct
+     *
+     * @return void
+     */
     public function testConstructor()
     {
         $parent = PMA_NodeFactory::getInstance('Node_Table_Container');
diff --git a/test/classes/navigation/PMA_Node_Table_test.php b/test/classes/navigation/PMA_Node_Table_test.php
index 40a881c6f2..99a0866f46 100644
--- a/test/classes/navigation/PMA_Node_Table_test.php
+++ b/test/classes/navigation/PMA_Node_Table_test.php
@@ -17,6 +17,11 @@ require_once 'libraries/Theme.class.php';
  */
 class Node_Table_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * SetUp for test cases
+     * 
+     * @return void
+     */
     public function setup()
     {
         $GLOBALS['server'] = 0;
@@ -24,6 +29,12 @@ class Node_Table_Test extends PHPUnit_Framework_TestCase
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
     }
 
+
+    /**
+     * Test for __construct
+     *
+     * @return void
+     */
     public function testConstructor()
     {
         $parent = PMA_NodeFactory::getInstance('Node_Table');
diff --git a/test/classes/navigation/PMA_Node_Trigger_Container_test.php b/test/classes/navigation/PMA_Node_Trigger_Container_test.php
index a9f77f991a..d62599caa7 100644
--- a/test/classes/navigation/PMA_Node_Trigger_Container_test.php
+++ b/test/classes/navigation/PMA_Node_Trigger_Container_test.php
@@ -17,6 +17,11 @@ require_once 'libraries/Theme.class.php';
  */
 class Node_Trigger_Container_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * SetUp for test cases
+     * 
+     * @return void
+     */
     public function setup()
     {
         $GLOBALS['server'] = 0;
@@ -24,6 +29,12 @@ class Node_Trigger_Container_Test extends PHPUnit_Framework_TestCase
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
     }
 
+
+    /**
+     * Test for __construct
+     *
+     * @return void
+     */
     public function testConstructor()
     {
         $parent = PMA_NodeFactory::getInstance('Node_Trigger_Container');
diff --git a/test/classes/navigation/PMA_Node_Trigger_test.php b/test/classes/navigation/PMA_Node_Trigger_test.php
index ff713845a8..a76c96cffe 100644
--- a/test/classes/navigation/PMA_Node_Trigger_test.php
+++ b/test/classes/navigation/PMA_Node_Trigger_test.php
@@ -17,6 +17,11 @@ require_once 'libraries/Theme.class.php';
  */
 class Node_Trigger_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * SetUp for test cases
+     * 
+     * @return void
+     */
     public function setup()
     {
         $GLOBALS['server'] = 0;
@@ -24,6 +29,12 @@ class Node_Trigger_Test extends PHPUnit_Framework_TestCase
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
     }
 
+
+    /**
+     * Test for __construct
+     *
+     * @return void
+     */
     public function testConstructor()
     {
         $parent = PMA_NodeFactory::getInstance('Node_Trigger');
diff --git a/test/classes/navigation/PMA_Node_View_Container_test.php b/test/classes/navigation/PMA_Node_View_Container_test.php
index 39cd7e1b41..1ce0e79dac 100644
--- a/test/classes/navigation/PMA_Node_View_Container_test.php
+++ b/test/classes/navigation/PMA_Node_View_Container_test.php
@@ -17,6 +17,11 @@ require_once 'libraries/Theme.class.php';
  */
 class Node_View_Container_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * SetUp for test cases
+     * 
+     * @return void
+     */
     public function setup()
     {
         $GLOBALS['server'] = 0;
@@ -24,6 +29,12 @@ class Node_View_Container_Test extends PHPUnit_Framework_TestCase
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
     }
 
+
+    /**
+     * Test for __construct
+     *
+     * @return void
+     */
     public function testConstructor()
     {
         $parent = PMA_NodeFactory::getInstance('Node_View_Container');
diff --git a/test/classes/navigation/PMA_Node_View_test.php b/test/classes/navigation/PMA_Node_View_test.php
index a0f096c63f..293a388a35 100644
--- a/test/classes/navigation/PMA_Node_View_test.php
+++ b/test/classes/navigation/PMA_Node_View_test.php
@@ -17,6 +17,11 @@ require_once 'libraries/Theme.class.php';
  */
 class Node_View_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * SetUp for test cases
+     * 
+     * @return void
+     */
     public function setup()
     {
         $GLOBALS['server'] = 0;
@@ -24,6 +29,12 @@ class Node_View_Test extends PHPUnit_Framework_TestCase
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
     }
 
+
+    /**
+     * Test for __construct
+     *
+     * @return void
+     */
     public function testConstructor()
     {
         $parent = PMA_NodeFactory::getInstance('Node_View');
diff --git a/test/classes/navigation/PMA_Node_test.php b/test/classes/navigation/PMA_Node_test.php
index 4a25d262be..6fc27b6638 100644
--- a/test/classes/navigation/PMA_Node_test.php
+++ b/test/classes/navigation/PMA_Node_test.php
@@ -18,6 +18,11 @@ require_once 'libraries/database_interface.inc.php';
  */
 class Node_Test extends PHPUnit_Framework_TestCase
 {
+    /**
+     * SetUp for test cases
+     * 
+     * @return void
+     */
     public function setup()
     {
         $GLOBALS['server'] = 0;
@@ -25,6 +30,11 @@ class Node_Test extends PHPUnit_Framework_TestCase
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
     }
 
+    /**
+     * SetUp for AddNode
+     *
+     * @return void
+     */
     public function testAddNode()
     {
         $parent = PMA_NodeFactory::getInstance('Node', 'parent');
@@ -40,6 +50,11 @@ class Node_Test extends PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * SetUp for getChild
+     *
+     * @return void
+     */
     public function testGetChildError()
     {
         $parent = PMA_NodeFactory::getInstance('Node', 'parent');
@@ -53,6 +68,11 @@ class Node_Test extends PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * SetUp for getChild
+     *
+     * @return void
+     */
     public function testRemoveNode()
     {
         $parent = PMA_NodeFactory::getInstance('Node', 'parent');
@@ -69,6 +89,11 @@ class Node_Test extends PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * SetUp for hasChildren
+     *
+     * @return void
+     */
     public function testNodeHasChildren()
     {
         $parent = PMA_NodeFactory::getInstance();
@@ -107,6 +132,11 @@ class Node_Test extends PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * SetUp for numChildren
+     *
+     * @return void
+     */
     public function testNumChildren()
     {
         // start with root node only
@@ -134,6 +164,11 @@ class Node_Test extends PHPUnit_Framework_TestCase
         $this->assertEquals($parent->numChildren(), 3);
     }
 
+    /**
+     * SetUp for parents
+     *
+     * @return void
+     */
     public function testParents()
     {
         $parent = PMA_NodeFactory::getInstance();
@@ -150,6 +185,11 @@ class Node_Test extends PHPUnit_Framework_TestCase
         ); // include self
     }
 
+    /**
+     * SetUp for realParent
+     *
+     * @return void
+     */
     public function testRealParent()
     {
         $parent = PMA_NodeFactory::getInstance();
@@ -403,6 +443,11 @@ class Node_Test extends PHPUnit_Framework_TestCase
         $node->getPresence('', 'dbname');
     }
 
+    /**
+     * SetUp for getComment
+     *
+     * @return void
+     */
     public function testComment()
     {
         // A non-qualified Node shouldn't have a comment
diff --git a/test/classes/plugin/transformations/Image_PNG_Inline_test.php b/test/classes/plugin/transformations/Image_PNG_Inline_test.php
index 2facf47d8e..d72554e28b 100644
--- a/test/classes/plugin/transformations/Image_PNG_Inline_test.php
+++ b/test/classes/plugin/transformations/Image_PNG_Inline_test.php
@@ -124,7 +124,8 @@ class Image_PNG_Inline_Test extends PHPUnit_Framework_TestCase
         $buffer = "PMA_PNG_Inline";
         $options = array("./image/", "200", "wrapper_link"=>"PMA_wrapper_link");
         $result = '<a href="transformation_wrapper.phpPMA_wrapper_link"'
-            . ' target="_blank"><img src="transformation_wrapper.phpPMA_wrapper_link&amp;'
+            . ' target="_blank"><img src="transformation_wrapper.php' 
+            . 'PMA_wrapper_link&amp;'
             . 'resize=jpeg&amp;newWidth=./image/&amp;newHeight=200" '
             . 'alt="PMA_PNG_Inline" border="0" /></a>';
         $this->assertEquals(
diff --git a/test/classes/plugin/transformations/Text_Plain_Append_test.php b/test/classes/plugin/transformations/Text_Plain_Append_test.php
index 223050388c..b5abf2a0c2 100644
--- a/test/classes/plugin/transformations/Text_Plain_Append_test.php
+++ b/test/classes/plugin/transformations/Text_Plain_Append_test.php
@@ -58,7 +58,8 @@ class Text_Plain_Append_Test extends PHPUnit_Framework_TestCase
      */
     public function testGetInfo()
     {
-        $info = 'Appends text to a string. The only option is the text to be appended'
+        $info = 'Appends text to a string. The only option is ' 
+            . 'the text to be appended'
             . ' (enclosed in single quotes, default empty string).';     
         $this->assertEquals(
             $info,
diff --git a/test/classes/plugin/transformations/Text_Plain_Dateformat_test.php b/test/classes/plugin/transformations/Text_Plain_Dateformat_test.php
index c930e27bd5..d7b22fe0c3 100644
--- a/test/classes/plugin/transformations/Text_Plain_Dateformat_test.php
+++ b/test/classes/plugin/transformations/Text_Plain_Dateformat_test.php
@@ -165,7 +165,8 @@ class Text_Plain_Dateformat_Test extends PHPUnit_Framework_TestCase
 
         //string
         $timestamp = "20100201";
-        $result = '<dfn onclick="alert(\'20100201\');" title="20100201">Feb 01, 2010 at 12:00 AM</dfn>';
+        $result = '<dfn onclick="alert(\'20100201\');" title="20100201">' 
+            . 'Feb 01, 2010 at 12:00 AM</dfn>';
         $this->assertEquals(
             $result,
             $this->object->applyTransformation($timestamp, $options, $meta)
@@ -175,6 +176,11 @@ class Text_Plain_Dateformat_Test extends PHPUnit_Framework_TestCase
     }
 }
 
+/**
+ * Mock Class Text_Plain_Dateformat_Meta
+ *
+ * @package PhpMyAdmin-test
+ */
 class Text_Plain_Dateformat_Meta
 {
     var $blob = null;
diff --git a/test/classes/plugin/transformations/Text_Plain_External_test.php b/test/classes/plugin/transformations/Text_Plain_External_test.php
index c8c3b3c786..8824ea1e42 100644
--- a/test/classes/plugin/transformations/Text_Plain_External_test.php
+++ b/test/classes/plugin/transformations/Text_Plain_External_test.php
@@ -155,17 +155,30 @@ class Text_Plain_External_Test extends PHPUnit_Framework_TestCase
             true,
             $this->object->applyTransformationNoWrap($options)
         );
-        $options = array("/dev/null -i -wrap -q", "/dev/null -i -wrap -q", "/dev/null -i -wrap -q", 1);
+        $options = array(
+            "/dev/null -i -wrap -q", 
+            "/dev/null -i -wrap -q", 
+            "/dev/null -i -wrap -q", 1
+        );
         $this->assertEquals(
             true,
             $this->object->applyTransformationNoWrap($options)
         );
-        $options = array("/dev/null -i -wrap -q", "/dev/null -i -wrap -q", "/dev/null -i -wrap -q", "1");
+        $options = array(
+            "/dev/null -i -wrap -q", 
+            "/dev/null -i -wrap -q", 
+            "/dev/null -i -wrap -q", "1"
+        );
         $this->assertEquals(
             true,
             $this->object->applyTransformationNoWrap($options)
         );
-        $options = array("/dev/null -i -wrap -q", "/dev/null -i -wrap -q", "/dev/null -i -wrap -q", 2);
+        $options = array(
+            "/dev/null -i -wrap -q", 
+            "/dev/null -i -wrap -q", 
+            "/dev/null -i -wrap -q", 
+            2
+        );
         $this->assertEquals(
             false,
             $this->object->applyTransformationNoWrap($options)
diff --git a/test/classes/plugin/transformations/Text_Plain_Imagelink_test.php b/test/classes/plugin/transformations/Text_Plain_Imagelink_test.php
index c19abea4d7..1fccd50990 100644
--- a/test/classes/plugin/transformations/Text_Plain_Imagelink_test.php
+++ b/test/classes/plugin/transformations/Text_Plain_Imagelink_test.php
@@ -60,7 +60,8 @@ class Text_Plain_Imagelink_Test extends PHPUnit_Framework_TestCase
     {
         $info = 'Displays an image and a link; '
             . 'the column contains the filename. The first option'
-            . ' is a URL prefix like "http://www.example.com/". The second and third options'
+            . ' is a URL prefix like "http://www.example.com/". ' 
+            . 'The second and third options'
             . ' are the width and the height in pixels.';
         $this->assertEquals(
             $info,
diff --git a/test/classes/schema/Dia_Relation_Schema_test.php b/test/classes/schema/Dia_Relation_Schema_test.php
index 340e2ac52c..87f684e6ee 100644
--- a/test/classes/schema/Dia_Relation_Schema_test.php
+++ b/test/classes/schema/Dia_Relation_Schema_test.php
@@ -98,7 +98,8 @@ class PMA_Dia_Relation_Schema_Test extends PHPUnit_Framework_TestCase
               `label` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '',
               `query` text COLLATE utf8_bin NOT NULL,
               PRIMARY KEY (`id`)
-             ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Bookmarks'";
+             ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 " 
+            . "COLLATE=utf8_bin COMMENT='Bookmarks'";
         
         $dbi->expects($this->once())
             ->method('fetchValue')
diff --git a/test/classes/schema/Eps_Relation_Schema_test.php b/test/classes/schema/Eps_Relation_Schema_test.php
index 71ffbb7d7a..871dc07d8e 100644
--- a/test/classes/schema/Eps_Relation_Schema_test.php
+++ b/test/classes/schema/Eps_Relation_Schema_test.php
@@ -99,7 +99,8 @@ class PMA_Eps_Relation_Schema_Test extends PHPUnit_Framework_TestCase
               `label` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '',
               `query` text COLLATE utf8_bin NOT NULL,
               PRIMARY KEY (`id`)
-             ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Bookmarks'";
+             ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 " 
+            . "COLLATE=utf8_bin COMMENT='Bookmarks'";
         
         $dbi->expects($this->once())
             ->method('fetchValue')
diff --git a/test/classes/schema/Pdf_Relation_Schema_test.php b/test/classes/schema/Pdf_Relation_Schema_test.php
index 6f60534d0a..9ad7a76eeb 100644
--- a/test/classes/schema/Pdf_Relation_Schema_test.php
+++ b/test/classes/schema/Pdf_Relation_Schema_test.php
@@ -139,7 +139,8 @@ class PMA_Pdf_Relation_Schema_Test extends PHPUnit_Framework_TestCase
               `label` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '',
               `query` text COLLATE utf8_bin NOT NULL,
               PRIMARY KEY (`id`)
-             ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Bookmarks'";
+             ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 " 
+            . "COLLATE=utf8_bin COMMENT='Bookmarks'";
         
         $dbi->expects($this->once())
             ->method('fetchValue')
diff --git a/test/classes/schema/Svg_Relation_Schema_test.php b/test/classes/schema/Svg_Relation_Schema_test.php
index 30a4008cbd..b8343924a7 100644
--- a/test/classes/schema/Svg_Relation_Schema_test.php
+++ b/test/classes/schema/Svg_Relation_Schema_test.php
@@ -100,7 +100,8 @@ class PMA_Svg_Relation_Schema_Test extends PHPUnit_Framework_TestCase
               `label` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '',
               `query` text COLLATE utf8_bin NOT NULL,
               PRIMARY KEY (`id`)
-             ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Bookmarks'";
+             ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 " 
+            . "COLLATE=utf8_bin COMMENT='Bookmarks'";
         
         $dbi->expects($this->once())
             ->method('fetchValue')