diff --git a/lib/pgsql_tokenizer.cpp b/lib/pgsql_tokenizer.cpp
index 565cb2c94..bd3bac996 100644
--- a/lib/pgsql_tokenizer.cpp
+++ b/lib/pgsql_tokenizer.cpp
@@ -28,13 +28,6 @@ static inline char is_normal_char(char c)
 	return 0;
 }
 
-static inline bool is_alpha_or_underscore(char c)
-{
-	return (c >= 'A' && c <= 'Z') ||
-		(c >= 'a' && c <= 'z') ||
-		c == '_';
-}
-
 // token char - not table name string
 static inline char is_token_char(char c)
 {
diff --git a/test/tap/groups/groups.json b/test/tap/groups/groups.json
index b95ebb3f8..9edc4c127 100644
--- a/test/tap/groups/groups.json
+++ b/test/tap/groups/groups.json
@@ -234,5 +234,6 @@
   "test_ssl_fast_forward-2_libmysql-t": [ "default-g4", "mysql-auto_increment_delay_multiplex=0-g4", "mysql-multiplexing=false-g4", "mysql-query_digests=0-g4", "mysql-query_digests_keep_comment=1-g4" ],
   "test_ssl_fast_forward-3_libmariadb-t": [ "default-g4", "mysql-auto_increment_delay_multiplex=0-g4", "mysql-multiplexing=false-g4", "mysql-query_digests=0-g4", "mysql-query_digests_keep_comment=1-g4" ],
   "test_ssl_fast_forward-3_libmysql-t": [ "default-g4", "mysql-auto_increment_delay_multiplex=0-g4", "mysql-multiplexing=false-g4", "mysql-query_digests=0-g4", "mysql-query_digests_keep_comment=1-g4" ],
-  "test_ignore_min_gtid-t": [ "default-g4", "mysql-auto_increment_delay_multiplex=0-g4", "mysql-multiplexing=false-g4", "mysql-query_digests=0-g4", "mysql-query_digests_keep_comment=1-g4" ]
+  "test_ignore_min_gtid-t": [ "default-g4", "mysql-auto_increment_delay_multiplex=0-g4", "mysql-multiplexing=false-g4", "mysql-query_digests=0-g4", "mysql-query_digests_keep_comment=1-g4" ],
+  "pgsql-query_digests_stages_test-t": [ "default-g4", "mysql-auto_increment_delay_multiplex=0-g4", "mysql-multiplexing=false-g4", "mysql-query_digests=0-g4", "mysql-query_digests_keep_comment=1-g4" ]
 }
diff --git a/test/tap/tests/pgsql-query_digests_stages_test-t.cpp b/test/tap/tests/pgsql-query_digests_stages_test-t.cpp
index eb0fd75e0..7b6dc2779 100644
--- a/test/tap/tests/pgsql-query_digests_stages_test-t.cpp
+++ b/test/tap/tests/pgsql-query_digests_stages_test-t.cpp
@@ -877,7 +877,7 @@ int main(int argc, char** argv) {
 		return EXIT_FAILURE;
 	}
 
-	bool exec_crashing_tests = true; // NOT IMPLEMENTED YET
+	bool exec_crashing_tests = false; // NOT IMPLEMENTED YET
 	bool exec_grouping_tests = true;
 	bool exec_regular_tests = true;
 	std::string tests_filter_str{};
@@ -887,9 +887,9 @@ int main(int argc, char** argv) {
 	if (argc >= 2) {
 		tests_filter_str = argv[1];
 
-		//if (tests_filter_str.find("crashing") == std::string::npos) {
-		//	exec_crashing_tests = false;
-		//}
+		if (tests_filter_str.find("crashing") == std::string::npos) {
+			exec_crashing_tests = false;
+		}
 		if (tests_filter_str.find("grouping") == std::string::npos) {
 			exec_grouping_tests = false;
 		}