diff --git a/server/modules/protocol/MySQL/MySQLClient/test/test_setsqlmodeparser.cc b/server/modules/protocol/MySQL/MySQLClient/test/test_setsqlmodeparser.cc
index 4847b12ce..6eac09cb6 100644
--- a/server/modules/protocol/MySQL/MySQLClient/test/test_setsqlmodeparser.cc
+++ b/server/modules/protocol/MySQL/MySQLClient/test/test_setsqlmodeparser.cc
@@ -60,6 +60,16 @@ struct TEST_CASE
         P::IS_SET_SQL_MODE,
         P::DEFAULT
     },
+    {
+        "-- This is a comment\nSET SQL_MODE=DEFAULT",
+        P::IS_SET_SQL_MODE,
+        P::DEFAULT
+    },
+    {
+        "#This is a comment\nSET SQL_MODE=DEFAULT",
+        P::IS_SET_SQL_MODE,
+        P::DEFAULT
+    },
     {
         "/*blah*/ SET /*blah*/ SQL_MODE /*blah*/ = /*blah*/ DEFAULT /*blah*/ ",
         P::IS_SET_SQL_MODE,