diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php
index 0db209a904..75dc9abf2b 100644
--- a/libraries/mysql_charsets.lib.php
+++ b/libraries/mysql_charsets.lib.php
@@ -89,7 +89,7 @@ function PMA_generateCharsetDropdownBox($type = PMA_CSDROPDOWN_COLLATION,
 function PMA_generateCharsetQueryPart($collation)
 {
     list($charset) = explode('_', $collation);
-    return ' CHARACTER SET ' . $charset
+    return ' CHARSET=' . $charset
         . ($charset == $collation ? '' : ' COLLATE ' . $collation);
 }
 
diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php
index 8e50ec4601..12880eff11 100644
--- a/test/classes/TableTest.php
+++ b/test/classes/TableTest.php
@@ -682,8 +682,8 @@ class TableTest extends PMATestCase
             $extra, $comment, $virtuality, $expression, $move_to
         );
 
-        $expect = "`name` `new_name` VARCHAR(2) new_name CHARACTER "
-            . "SET charset1 NULL DEFAULT 'VARCHAR' "
+        $expect = "`name` `new_name` VARCHAR(2) new_name CHARSET="
+            . "charset1 NULL DEFAULT 'VARCHAR' "
             . "AUTO_INCREMENT COMMENT 'PMA comment' AFTER `new_name`";
 
         $this->assertEquals(
diff --git a/test/libraries/PMA_mysql_charsets_test.php b/test/libraries/PMA_mysql_charsets_test.php
index c0ebb018e1..3e016eb9d4 100644
--- a/test/libraries/PMA_mysql_charsets_test.php
+++ b/test/libraries/PMA_mysql_charsets_test.php
@@ -45,9 +45,9 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase
     public function charsetQueryData()
     {
         return array(
-            array("a_b_c_d", " CHARACTER SET a COLLATE a_b_c_d"),
-            array("a_", " CHARACTER SET a COLLATE a_"),
-            array("a", " CHARACTER SET a"),
+            array("a_b_c_d", " CHARSET=a COLLATE a_b_c_d"),
+            array("a_", " CHARSET=a COLLATE a_"),
+            array("a", " CHARSET=a"),
         );
     }