diff --git a/test/libraries/PMA_SQL_parser_test.php b/test/libraries/PMA_SQL_parser_test.php
index f8a78ceb4a..9b74e74762 100644
--- a/test/libraries/PMA_SQL_parser_test.php
+++ b/test/libraries/PMA_SQL_parser_test.php
@@ -10,6 +10,7 @@
  * Include to test.
  */
 require_once 'libraries/sqlparser.lib.php';
+require_once 'libraries/sqlparser.data.php';
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/Message.class.php';
 require_once 'libraries/Util.class.php';
@@ -52,7 +53,17 @@ class PMA_SQLParser_Test extends PHPUnit_Framework_TestCase
         $this->assertEquals('', PMA_SQP_getErrorString());
         $this->assertEquals($expected, $parsed_sql);
     }
-
+    
+    public function testPMA_SQP_isKeyWord()
+    {
+        PMA_SQP_resetError();
+        $this->assertEquals(true, PMA_SQP_isKeyWord("ACCESSIBLE"));
+        $this->assertEquals(true, PMA_SQP_isKeyWord("accessible"));
+        $this->assertEquals(true, PMA_SQP_isKeyWord("ASC"));
+        $this->assertEquals(false, PMA_SQP_isKeyWord("hello"));
+    }
+    
+    
     /**
      * Data provider for parser testing
      *
diff --git a/test/libraries/PMA_SQL_validator_test.php b/test/libraries/PMA_SQL_validator_test.php
new file mode 100644
index 0000000000..11f5701998
--- /dev/null
+++ b/test/libraries/PMA_SQL_validator_test.php
@@ -0,0 +1,58 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Tests for correctness of SQL validator
+ *
+ * @package PhpMyAdmin-test
+ */
+
+/*
+ * Include to test.
+ */
+define('PMA_MYSQL_STR_VERSION', "PMA_MYSQL_STR_VERSION");
+global $cfg;
+
+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';
+require_once 'libraries/sqlvalidator.class.php';
+require_once 'libraries/sqlvalidator.lib.php';
+
+class PMA_SQLValidator_Test extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Prepares environment for the test.
+     *
+     * @return void
+     */
+    public function setUp()
+    {
+        if (function_exists('mb_internal_encoding')) {
+            mb_internal_encoding('utf-8');
+        }
+        $_SESSION['PMA_Theme'] = new PMA_Theme();
+        $GLOBALS['pmaThemeImage'] = 'theme/';
+        $GLOBALS['cfg']['SQLValidator']['username'] = "PMA_username";
+        $GLOBALS['cfg']['SQLValidator']['password'] = "PMA_password";
+    }
+    
+    public function testPMA_validateSQL()
+    {
+    	$sql = "select * from PMA_test";
+        $GLOBALS['cfg']['SQLValidator']['use'] = false;
+        $this->assertEquals(
+        	'',
+        	PMA_validateSQL($sql)
+        );
+
+        $GLOBALS['cfg']['SQLValidator']['use'] = true;
+        $GLOBALS['sqlvalidator_error'] = true;
+        $this->assertContains(
+        	'The SQL validator could not be initialized.',
+        	PMA_validateSQL($sql)
+        );
+    }
+}
+?>