diff --git a/tests/queries/0_stateless/00976_system_stop_ttl_merges.sql b/tests/queries/0_stateless/00976_system_stop_ttl_merges.sql
index 41f2428d9e6..b27e4275d5d 100644
--- a/tests/queries/0_stateless/00976_system_stop_ttl_merges.sql
+++ b/tests/queries/0_stateless/00976_system_stop_ttl_merges.sql
@@ -2,7 +2,7 @@ drop table if exists ttl;
 
 create table ttl (d Date, a Int) engine = MergeTree order by a partition by toDayOfMonth(d) ttl d + interval 1 day;
 
-system stop ttl merges;
+system stop ttl merges ttl;
 
 insert into ttl values (toDateTime('2000-10-10 00:00:00'), 1), (toDateTime('2000-10-10 00:00:00'), 2)
 insert into ttl values (toDateTime('2100-10-10 00:00:00'), 3), (toDateTime('2100-10-10 00:00:00'), 4);
@@ -11,7 +11,7 @@ select sleep(1) format Null; -- wait if very fast merge happen
 optimize table ttl partition 10 final;
 select * from ttl order by d, a;
 
-system start ttl merges;
+system start ttl merges ttl;
 optimize table ttl partition 10 final;
 select * from ttl order by d, a;
 
diff --git a/tests/queries/0_stateless/01666_merge_tree_max_query_limit.sh b/tests/queries/0_stateless/01666_merge_tree_max_query_limit.sh
index e32a83c9560..ce6aa1dee5d 100755
--- a/tests/queries/0_stateless/01666_merge_tree_max_query_limit.sh
+++ b/tests/queries/0_stateless/01666_merge_tree_max_query_limit.sh
@@ -18,9 +18,11 @@ settings index_granularity = 1, max_concurrent_queries = 1, min_marks_to_honor_m
 insert into simple select number, number + 100 from numbers(1000);
 "
 
+query_id = "long_running_query-$CLICKHOUSE_DATABASE"
+
 echo "Spin up a long running query"
-${CLICKHOUSE_CLIENT} --query "select sleepEachRow(0.01) from simple settings max_block_size = 1 format Null" --query_id "long_running_query" > /dev/null 2>&1 &
-wait_for_query_to_start 'long_running_query'
+${CLICKHOUSE_CLIENT} --query "select sleepEachRow(0.01) from simple settings max_block_size = 1 format Null" --query_id "$query_id" > /dev/null 2>&1 &
+wait_for_query_to_start "$query_id"
 
 # query which reads marks >= min_marks_to_honor_max_concurrent_queries is throttled
 echo "Check if another query with some marks to read is throttled"
@@ -61,7 +63,7 @@ CODE=$?
 [ "$CODE" -ne "202" ] && echo "Expected error code: 202 but got: $CODE" && exit 1;
 echo "yes"
 
-${CLICKHOUSE_CLIENT} --query "KILL QUERY WHERE query_id = 'long_running_query' SYNC"
+${CLICKHOUSE_CLIENT} --query "KILL QUERY WHERE query_id = '$query_id' SYNC"
 wait
 
 ${CLICKHOUSE_CLIENT} --multiline --multiquery --query "