diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index 38c8ad90eb..1a85e8be46 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -488,8 +488,8 @@ class PMA_Table
             }
             break;
         case 'NULL' :
-            //If user uncheck null checkbox and not change default value null,
-            //default value will be ignored.
+            // If user uncheck null checkbox and not change default value null,
+            // default value will be ignored.
             if ($null !== false && $null != 'NULL') {
                 break;
             }
diff --git a/test/classes/PMA_Message_test.php b/test/classes/PMA_Message_test.php
index 1fdda686b8..9467c7bc2d 100644
--- a/test/classes/PMA_Message_test.php
+++ b/test/classes/PMA_Message_test.php
@@ -305,9 +305,9 @@ class PMA_Message_Test extends PHPUnit_Framework_TestCase
     public function testSetParams()
     {
         $this->object->setParams('test&<>');
-        $this->assertEquals('test&<>', $this->object->getParams());
+        $this->assertEquals(array('test&<>'), $this->object->getParams());
         $this->object->setParams('test&<>', true);
-        $this->assertEquals('test&amp;&lt;&gt;', $this->object->getParams());
+        $this->assertEquals(array('test&amp;&lt;&gt;'), $this->object->getParams());
     }
 
     /**