diff --git a/server/modules/protocol/MySQL/CMakeLists.txt b/server/modules/protocol/MySQL/CMakeLists.txt
index c8e967bf3..5669ead0f 100644
--- a/server/modules/protocol/MySQL/CMakeLists.txt
+++ b/server/modules/protocol/MySQL/CMakeLists.txt
@@ -5,3 +5,4 @@ install_module(MySQLCommon core)
 
 add_subdirectory(MySQLBackend)
 add_subdirectory(MySQLClient)
+add_subdirectory(test)
diff --git a/server/modules/protocol/MySQL/test/CMakeLists.txt b/server/modules/protocol/MySQL/test/CMakeLists.txt
new file mode 100644
index 000000000..5da15e4b3
--- /dev/null
+++ b/server/modules/protocol/MySQL/test/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_executable(test_parse_kill test_parse_kill.c)
+target_link_libraries(test_parse_kill maxscale-common MySQLCommon)
+add_test(test_parse_kill test_parse_kill)
+
diff --git a/server/modules/protocol/MySQL/test/test_parse_kill.c b/server/modules/protocol/MySQL/test/test_parse_kill.c
new file mode 100644
index 000000000..075ba7e09
--- /dev/null
+++ b/server/modules/protocol/MySQL/test/test_parse_kill.c
@@ -0,0 +1,89 @@
+#include <maxscale/cdefs.h>
+
+#include "../MySQLClient/mysql_client.c"
+
+int test_one_query(char *query, bool should_succeed, uint64_t expected_tid,
+                   kill_type_t expected_kt)
+{
+    char *query_copy = MXS_STRDUP_A(query);
+    uint64_t result_tid = 1111111;
+    kill_type_t result_kt = KT_QUERY;
+
+    /* If the parse fails, these should remain unchanged */
+    if (!should_succeed)
+    {
+        result_tid = expected_tid;
+        result_kt = expected_kt;
+    }
+    bool success = parse_kill_query(query_copy, &result_tid, &result_kt);
+    MXS_FREE(query_copy);
+
+    if ((success == should_succeed) && (result_tid == expected_tid) &&
+        (result_kt == expected_kt))
+    {
+        return 0;
+    }
+    else
+    {
+        printf("Result wrong on query: '%s'.\n", query);
+        if (success != should_succeed)
+        {
+            printf("Expected success '%d', got '%d'.\n", should_succeed, success);
+        }
+        if (result_tid != expected_tid)
+        {
+            printf("Expected thread id '%" PRIu64 "', got '%" PRIu64 "'.\n",
+                   expected_tid, result_tid);
+        }
+        if (result_kt != expected_kt)
+        {
+            printf("Expected kill type '%u', got '%u'.\n",
+                   expected_kt, result_kt);
+        }
+        printf("\n");
+        return 1;
+    }
+}
+typedef struct test_t
+{
+    char *query;
+    bool should_succeed;
+    uint64_t correct_id;
+    kill_type_t correct_kt;
+} test_t;
+
+int main(int argc, char **argv)
+{
+    test_t tests[] =
+    {
+        {" kill ConNectioN 123  ",        true, 123, KT_CONNECTION},
+        {"kIlL  coNNectioN 987654321  ;", true, 987654321, KT_CONNECTION},
+        {" Ki5L CoNNectioN 987654321  ",  false, 0, KT_CONNECTION},
+        {"1",                             false, 0, KT_CONNECTION},
+        {"kILL 1",                        true, 1, KT_CONNECTION},
+        {"\n\t kill \nQueRy 456",         true, 456, KT_QUERY},
+        {"     A         kill 1;     ",   false, 0, KT_CONNECTION},
+        {" kill connection 1A",           false, 0, KT_CONNECTION},
+        {" kill connection 1 A ",         false, 0, KT_CONNECTION},
+        {"kill query 7 ; select * ",      false, 0, KT_CONNECTION},
+        {
+            "KIll query   \t    \n    \t   12345678901234567890  \n \t   ",
+            true, 12345678901234567890ULL, KT_QUERY
+        },
+        {"KIll query   \t    \n    \t   21  \n \t   ", true, 21, KT_QUERY},
+        {"KIll   \t    \n    \t   -6  \n \t   ",       false, 0, KT_CONNECTION},
+        {"KIll 12345678901234567890123456  \n \t   ",  false, 0, KT_CONNECTION},
+        {"kill ;", false, 0, KT_QUERY}
+    };
+    int result = 0;
+    int arr_size = sizeof(tests) / sizeof(test_t);
+    for (int i = 0; i < arr_size; i++)
+    {
+        char *query = tests[i].query;
+        bool should_succeed = tests[i].should_succeed;
+        uint64_t expected_tid = tests[i].correct_id;
+        kill_type_t expected_kt = tests[i].correct_kt;
+        result += test_one_query(query, should_succeed, expected_tid, expected_kt);
+    }
+    return result;
+}