diff --git a/tests/queries/0_stateless/01531_query_log_query_comment.sql b/tests/queries/0_stateless/01531_query_log_query_comment.sql
index 81348c53589..2e1faf1b9e4 100644
--- a/tests/queries/0_stateless/01531_query_log_query_comment.sql
+++ b/tests/queries/0_stateless/01531_query_log_query_comment.sql
@@ -4,9 +4,17 @@ set log_queries_min_type='QUERY_FINISH';
 set enable_global_with_statement=1;
 select /* test=01531, enable_global_with_statement=0 */ 2;
 system flush logs;
-select count() from system.query_log where event_time >= now() - interval 5 minute and query like '%select /* test=01531, enable_global_with_statement=0 */ 2%';
+select count() from system.query_log
+where event_time >= now() - interval 5 minute
+    and query like '%select /* test=01531, enable_global_with_statement=0 */ 2%'
+    and current_database = currentDatabase()
+    ;
 
 set enable_global_with_statement=1;
 select /* test=01531 enable_global_with_statement=1 */ 2;
 system flush logs;
-select count() from system.query_log where event_time >= now() - interval 5 minute and query like '%select /* test=01531 enable_global_with_statement=1 */ 2%';
+select count() from system.query_log
+where event_time >= now() - interval 5 minute
+    and query like '%select /* test=01531 enable_global_with_statement=1 */ 2%'
+    and current_database = currentDatabase()
+    ;