diff --git a/tests/config/users.d/limits.yaml b/tests/config/users.d/limits.yaml
index 4f3f439a997..1c9fff9f4c8 100644
--- a/tests/config/users.d/limits.yaml
+++ b/tests/config/users.d/limits.yaml
@@ -27,9 +27,9 @@ profiles:
     max_execution_speed: 100G
     max_execution_speed_bytes: 10T
     max_estimated_execution_time: 600
-    max_columns_to_read: 10K
-    max_temporary_columns: 10K
-    max_temporary_non_const_columns: 10K
+    max_columns_to_read: 20K
+    max_temporary_columns: 20K
+    max_temporary_non_const_columns: 20K
     max_sessions_for_user: 1K
     max_rows_in_set: 10G
     max_bytes_in_set: 10G
diff --git a/tests/queries/0_stateless/00111_shard_external_sort_distributed.reference b/tests/queries/0_stateless/00111_shard_external_sort_distributed.reference
index df5aa77af60..7534c12a0d8 100644
--- a/tests/queries/0_stateless/00111_shard_external_sort_distributed.reference
+++ b/tests/queries/0_stateless/00111_shard_external_sort_distributed.reference
@@ -1,20 +1,20 @@
-7040546
-7040546
-4327029
-4327029
-1613512
-1613512
-8947307
-8947307
-6233790
-6233790
-3520273
-3520273
-806756
-806756
-8140551
-8140551
-5427034
-5427034
-2713517
-2713517
+4437158
+4437158
+1723641
+1723641
+3630402
+3630402
+916885
+916885
+2823646
+2823646
+110129
+110129
+4730407
+4730407
+2016890
+2016890
+3923651
+3923651
+1210134
+1210134
diff --git a/tests/queries/0_stateless/00111_shard_external_sort_distributed.sql b/tests/queries/0_stateless/00111_shard_external_sort_distributed.sql
index 88a05f59111..ef9c0f9f9d0 100644
--- a/tests/queries/0_stateless/00111_shard_external_sort_distributed.sql
+++ b/tests/queries/0_stateless/00111_shard_external_sort_distributed.sql
@@ -6,6 +6,6 @@ SET max_bytes_before_external_sort = 10000000;
 DROP TABLE IF EXISTS numbers10m;
 CREATE VIEW numbers10m AS SELECT number FROM system.numbers LIMIT 5000000;
 
-SELECT number FROM remote('127.0.0.{2,3}', currentDatabase(), numbers10m) ORDER BY number * 1234567890123456789 LIMIT 19999980, 20;
+SELECT number FROM remote('127.0.0.{2,3}', currentDatabase(), numbers10m) ORDER BY number * 1234567890123456789 LIMIT 4999980, 20;
 
 DROP TABLE numbers10m;
diff --git a/tests/queries/0_stateless/00375_shard_group_uniq_array_of_string.sql b/tests/queries/0_stateless/00375_shard_group_uniq_array_of_string.sql
index f32a64cd30f..445ffe66f64 100644
--- a/tests/queries/0_stateless/00375_shard_group_uniq_array_of_string.sql
+++ b/tests/queries/0_stateless/00375_shard_group_uniq_array_of_string.sql
@@ -7,7 +7,7 @@ INSERT INTO group_uniq_str SELECT 2 as id, toString(number % 100) as v FROM syst
 INSERT INTO group_uniq_str SELECT 5 as id, toString(number % 100) as v FROM system.numbers LIMIT 10000000;
 
 SELECT length(groupUniqArray(v)) FROM group_uniq_str GROUP BY id ORDER BY id;
-SELECT length(groupUniqArray(v)) FROM remote('127.0.0.{2,3,4,5}', currentDatabase(), 'group_uniq_str') GROUP BY id ORDER BY id SETTINGS max_rows_to_read = '50M';
+SELECT length(groupUniqArray(v)) FROM remote('127.0.0.{2,3,4,5}', currentDatabase(), 'group_uniq_str') GROUP BY id ORDER BY id SETTINGS max_rows_to_read = '60M';
 SELECT length(groupUniqArray(10)(v)) FROM group_uniq_str GROUP BY id ORDER BY id;
 SELECT length(groupUniqArray(10000)(v)) FROM group_uniq_str GROUP BY id ORDER BY id;
 
diff --git a/tests/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.sql b/tests/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.sql
index 43066880102..7593e1e1580 100644
--- a/tests/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.sql
+++ b/tests/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.sql
@@ -6,7 +6,7 @@ CREATE TABLE group_uniq_arr_int ENGINE = Memory AS
 		(SELECT intDiv(number%1000000, 100) as v, intDiv(number%100, 10) as g, number%10 as c FROM system.numbers WHERE c < 3 LIMIT 10000000);
 
 SELECT length(groupUniqArray(v)) FROM group_uniq_arr_int GROUP BY id ORDER BY id;
-SELECT length(groupUniqArray(v)) FROM remote('127.0.0.{2,3,4,5}', currentDatabase(), 'group_uniq_arr_int') GROUP BY id ORDER BY id SETTINGS max_rows_to_read = '50M';
+SELECT length(groupUniqArray(v)) FROM remote('127.0.0.{2,3,4,5}', currentDatabase(), 'group_uniq_arr_int') GROUP BY id ORDER BY id SETTINGS max_rows_to_read = '55M';
 SELECT length(groupUniqArray(10)(v)) FROM group_uniq_arr_int GROUP BY id ORDER BY id;
 SELECT length(groupUniqArray(100000)(v)) FROM group_uniq_arr_int GROUP BY id ORDER BY id;
 
diff --git a/tests/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.sql b/tests/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.sql
index 1c4376ad577..8b48ee673f3 100644
--- a/tests/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.sql
+++ b/tests/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.sql
@@ -6,6 +6,6 @@ CREATE TABLE group_uniq_arr_str ENGINE = Memory AS
         (SELECT intDiv(number%1000000, 100) as v, intDiv(number%100, 10) as g, number%10 as c FROM system.numbers WHERE c < 3 LIMIT 10000000);
 
 SELECT length(groupUniqArray(v)) FROM group_uniq_arr_str GROUP BY id ORDER BY id;
-SELECT length(groupUniqArray(v)) FROM remote('127.0.0.{2,3,4,5}', currentDatabase(), 'group_uniq_arr_str') GROUP BY id ORDER BY id SETTINGS max_rows_to_read = '50M';
+SELECT length(groupUniqArray(v)) FROM remote('127.0.0.{2,3,4,5}', currentDatabase(), 'group_uniq_arr_str') GROUP BY id ORDER BY id SETTINGS max_rows_to_read = '55M';
 
 DROP TABLE IF EXISTS group_uniq_arr_str;
diff --git a/tests/queries/0_stateless/00600_replace_running_query.sh b/tests/queries/0_stateless/00600_replace_running_query.sh
index e7022875086..8f21443d589 100755
--- a/tests/queries/0_stateless/00600_replace_running_query.sh
+++ b/tests/queries/0_stateless/00600_replace_running_query.sh
@@ -8,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 TEST_PREFIX=$RANDOM
 ${CLICKHOUSE_CLIENT} -q "drop user if exists u_00600${TEST_PREFIX}"
-${CLICKHOUSE_CLIENT} -q "create user u_00600${TEST_PREFIX} settings max_execution_time=60, readonly=1"
+${CLICKHOUSE_CLIENT} -q "create user u_00600${TEST_PREFIX} settings max_execution_time=60, readonly=1, max_rows_to_read=0"
 ${CLICKHOUSE_CLIENT} -q "grant select on system.numbers to u_00600${TEST_PREFIX}"
 
 function wait_for_query_to_start()
@@ -26,7 +26,7 @@ $CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL&query_id=hello&replace_running_query=1" -d
 # Wait for it to be replaced
 wait
 
-${CLICKHOUSE_CLIENT_BINARY} --user=u_00600${TEST_PREFIX} --query_id=42 --max_rows_to_read=0 --query='SELECT 2, count() FROM system.numbers' 2>&1 | grep -cF 'was cancelled' &
+${CLICKHOUSE_CLIENT_BINARY} --user=u_00600${TEST_PREFIX} --query_id=42 --query='SELECT 2, count() FROM system.numbers' 2>&1 | grep -cF 'was cancelled' &
 wait_for_query_to_start '42'
 
 # Trying to run another query with the same query_id
diff --git a/tests/queries/0_stateless/00601_kill_running_query.reference b/tests/queries/0_stateless/00601_kill_running_query.reference
index 3917ff89482..7824d5804bc 100644
--- a/tests/queries/0_stateless/00601_kill_running_query.reference
+++ b/tests/queries/0_stateless/00601_kill_running_query.reference
@@ -1 +1 @@
-waiting	test_00601_default	default	SELECT sum(ignore(*)) FROM (SELECT number % 1000 AS k, groupArray(number) FROM numbers(50000000) GROUP BY k)
+waiting	test_00601_default	default	SELECT sum(ignore(*)) FROM (SELECT number % 1000 AS k, groupArray(number) FROM numbers(50000000) GROUP BY k) SETTINGS max_rows_to_read = 0
diff --git a/tests/queries/0_stateless/00906_low_cardinality_cache.sql b/tests/queries/0_stateless/00906_low_cardinality_cache.sql
index 15a53841761..efd96746dc4 100644
--- a/tests/queries/0_stateless/00906_low_cardinality_cache.sql
+++ b/tests/queries/0_stateless/00906_low_cardinality_cache.sql
@@ -1,5 +1,6 @@
+SET max_rows_to_read = '100M'
 drop table if exists lc_00906;
 create table lc_00906 (b LowCardinality(String)) engine=MergeTree order by b SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
-insert into lc_00906 select '0123456789' from numbers(100000000) SETTINGS max_rows_to_read = '100M';
+insert into lc_00906 select '0123456789' from numbers(100000000);
 select count(), b from lc_00906 group by b;
 drop table if exists lc_00906;
diff --git a/tests/queries/0_stateless/01091_query_profiler_does_not_hang.sql b/tests/queries/0_stateless/01091_query_profiler_does_not_hang.sql
index 21a84bdd691..45f1a00ae23 100644
--- a/tests/queries/0_stateless/01091_query_profiler_does_not_hang.sql
+++ b/tests/queries/0_stateless/01091_query_profiler_does_not_hang.sql
@@ -1,4 +1,4 @@
 -- Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug
 
-SET query_profiler_cpu_time_period_ns = 1;
+SET query_profiler_cpu_time_period_ns = 1, max_rows_to_read = 0;
 SELECT count() FROM numbers_mt(1000000000);
diff --git a/tests/queries/0_stateless/01293_show_settings.reference b/tests/queries/0_stateless/01293_show_settings.reference
index 9d326f16a3b..8b383813c9f 100644
--- a/tests/queries/0_stateless/01293_show_settings.reference
+++ b/tests/queries/0_stateless/01293_show_settings.reference
@@ -6,5 +6,6 @@ external_storage_connect_timeout_sec	UInt64	10
 s3_connect_timeout_ms	UInt64	1000
 filesystem_prefetch_max_memory_usage	UInt64	1073741824
 max_memory_usage	UInt64	5000000000
+max_memory_usage_for_user	UInt64	10000000000
 max_untracked_memory	UInt64	1048576
 memory_profiler_step	UInt64	1048576
diff --git a/tests/queries/0_stateless/01485_256_bit_multiply.sql b/tests/queries/0_stateless/01485_256_bit_multiply.sql
index 5c8c47c9127..18be2b11599 100644
--- a/tests/queries/0_stateless/01485_256_bit_multiply.sql
+++ b/tests/queries/0_stateless/01485_256_bit_multiply.sql
@@ -1,5 +1,7 @@
 -- Tags: no-random-settings, no-asan, no-msan, no-tsan, no-ubsan, no-debug
 
+SET max_rows_to_read = '100M'
+
 select count() from
 (
     select toInt128(number) * number x, toInt256(number) * number y from numbers_mt(100000000) where x != y
diff --git a/tests/queries/0_stateless/01603_read_with_backoff_bug.sql b/tests/queries/0_stateless/01603_read_with_backoff_bug.sql
index ec14f637c01..b68d15a2200 100644
--- a/tests/queries/0_stateless/01603_read_with_backoff_bug.sql
+++ b/tests/queries/0_stateless/01603_read_with_backoff_bug.sql
@@ -3,6 +3,7 @@
 
 set enable_filesystem_cache=0;
 set enable_filesystem_cache_on_write_operations=0;
+set max_rows_to_read = '30M';
 drop table if exists t;
 
 create table t (x UInt64, s String) engine = MergeTree order by x SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
diff --git a/tests/queries/0_stateless/01961_roaring_memory_tracking.sql b/tests/queries/0_stateless/01961_roaring_memory_tracking.sql
index 485c8192f69..79c722bd629 100644
--- a/tests/queries/0_stateless/01961_roaring_memory_tracking.sql
+++ b/tests/queries/0_stateless/01961_roaring_memory_tracking.sql
@@ -2,5 +2,5 @@
 
 SET max_bytes_before_external_group_by = 0;
 
-SET max_memory_usage = '100M';
+SET max_memory_usage = '100M', max_rows_to_read = '1B';
 SELECT cityHash64(rand() % 1000) as n, groupBitmapState(number) FROM numbers_mt(200000000) GROUP BY n FORMAT Null; -- { serverError MEMORY_LIMIT_EXCEEDED }
diff --git a/tests/queries/0_stateless/02003_memory_limit_in_client.sh b/tests/queries/0_stateless/02003_memory_limit_in_client.sh
index 96028f4847a..94eba8f25be 100755
--- a/tests/queries/0_stateless/02003_memory_limit_in_client.sh
+++ b/tests/queries/0_stateless/02003_memory_limit_in_client.sh
@@ -4,11 +4,11 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --max_memory_usage_in_client=1 -n -q "SELECT arrayMap(x -> range(x), range(number)) FROM numbers(1000) -- { clientError MEMORY_LIMIT_EXCEEDED }"
+$CLICKHOUSE_CLIENT --max_result_bytes 0 --max_memory_usage_in_client=1 -n -q "SELECT arrayMap(x -> range(x), range(number)) FROM numbers(1000) -- { clientError MEMORY_LIMIT_EXCEEDED }"
 $CLICKHOUSE_CLIENT --max_memory_usage_in_client=0 -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
 
-$CLICKHOUSE_CLIENT --max_memory_usage_in_client='5K' -n -q "SELECT arrayMap(x -> range(x), range(number)) FROM numbers(1000) -- { clientError MEMORY_LIMIT_EXCEEDED }"
-$CLICKHOUSE_CLIENT --max_memory_usage_in_client='5k' -n -q "SELECT arrayMap(x -> range(x), range(number)) FROM numbers(1000) -- { clientError MEMORY_LIMIT_EXCEEDED }"
+$CLICKHOUSE_CLIENT --max_result_bytes 0 --max_memory_usage_in_client='5K' -n -q "SELECT arrayMap(x -> range(x), range(number)) FROM numbers(1000) -- { clientError MEMORY_LIMIT_EXCEEDED }"
+$CLICKHOUSE_CLIENT --max_result_bytes 0 --max_memory_usage_in_client='5k' -n -q "SELECT arrayMap(x -> range(x), range(number)) FROM numbers(1000) -- { clientError MEMORY_LIMIT_EXCEEDED }"
 $CLICKHOUSE_CLIENT --max_memory_usage_in_client='1M' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
 $CLICKHOUSE_CLIENT --max_memory_usage_in_client='23G' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
 $CLICKHOUSE_CLIENT --max_memory_usage_in_client='11T' -n -q "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000"
diff --git a/tests/queries/0_stateless/02161_addressToLineWithInlines.sql b/tests/queries/0_stateless/02161_addressToLineWithInlines.sql
index cf400ed34c5..d7ce133f38c 100644
--- a/tests/queries/0_stateless/02161_addressToLineWithInlines.sql
+++ b/tests/queries/0_stateless/02161_addressToLineWithInlines.sql
@@ -6,7 +6,7 @@ SELECT addressToLineWithInlines(1); -- { serverError FUNCTION_NOT_ALLOWED }
 SET allow_introspection_functions = 1;
 SET query_profiler_real_time_period_ns = 0;
 SET query_profiler_cpu_time_period_ns = 1000000;
-SET log_queries = 1;
+SET log_queries = 1, max_rows_to_read = 0;
 SELECT count() FROM numbers_mt(10000000000) SETTINGS log_comment='02161_test_case';
 SET log_queries = 0;
 SET query_profiler_cpu_time_period_ns = 0;
diff --git a/tests/queries/0_stateless/02226_analyzer_or_like_combine.sql b/tests/queries/0_stateless/02226_analyzer_or_like_combine.sql
index fbebfc6d281..1cd6b8a4e4d 100644
--- a/tests/queries/0_stateless/02226_analyzer_or_like_combine.sql
+++ b/tests/queries/0_stateless/02226_analyzer_or_like_combine.sql
@@ -1,3 +1,5 @@
+SET allow_hyperscan = 1, max_hyperscan_regexp_length = 0, max_hyperscan_regexp_total_length = 0;
+
 EXPLAIN SYNTAX SELECT materialize('Привет, World') AS s WHERE (s LIKE 'hell%') OR (s ILIKE '%привет%') OR (s ILIKE 'world%') SETTINGS optimize_or_like_chain = 0;
 EXPLAIN QUERY TREE run_passes=1 SELECT materialize('Привет, World') AS s WHERE (s LIKE 'hell%') OR (s ILIKE '%привет%') OR (s ILIKE 'world%') SETTINGS optimize_or_like_chain = 0, allow_experimental_analyzer = 1;
 EXPLAIN SYNTAX SELECT materialize('Привет, World') AS s WHERE (s LIKE 'hell%') OR (s ILIKE '%привет%') OR (s ILIKE 'world%') SETTINGS optimize_or_like_chain = 1;
diff --git a/tests/queries/0_stateless/02234_cast_to_ip_address.reference b/tests/queries/0_stateless/02234_cast_to_ip_address.reference
index fa9c6bd0f94..3dd306477b9 100644
--- a/tests/queries/0_stateless/02234_cast_to_ip_address.reference
+++ b/tests/queries/0_stateless/02234_cast_to_ip_address.reference
@@ -26,9 +26,9 @@ IPv4 functions
 IPv6 functions
 \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0
 \N
-\0\0\0\0\0\0\0\0\0\0ÿÿ\0\0

-\0\0\0\0\0\0\0\0\0\0ÿÿ\0\0

-\0\0\0\0\0\0\0\0\0\0ÿÿ\0\0

+\0\0\0\0\0\0\0\0\0\0��\0\0

+\0\0\0\0\0\0\0\0\0\0��\0\0

+\0\0\0\0\0\0\0\0\0\0��\0\0

 --
 ::
 \N
@@ -37,7 +37,7 @@ IPv6 functions
 ::ffff:127.0.0.1
 ::
 \N
-100000000
+20000000
 --
 ::ffff:127.0.0.1
 --
diff --git a/tests/queries/0_stateless/02343_aggregation_pipeline.reference b/tests/queries/0_stateless/02343_aggregation_pipeline.reference
index bf61eb6da0a..eb013200a17 100644
--- a/tests/queries/0_stateless/02343_aggregation_pipeline.reference
+++ b/tests/queries/0_stateless/02343_aggregation_pipeline.reference
@@ -1,6 +1,6 @@
 -- { echoOn }
 
-explain pipeline select * from (select * from numbers(1e8) group by number) group by number;
+explain pipeline select * from (select * from numbers(1e8) group by number) group by number settings max_rows_to_read = 0;
 (Expression)
 ExpressionTransform × 16
   (Aggregating)
@@ -16,7 +16,7 @@ ExpressionTransform × 16
               ExpressionTransform
                 (ReadFromSystemNumbers)
                 NumbersRange 0 → 1
-explain pipeline select * from (select * from numbers_mt(1e8) group by number) group by number;
+explain pipeline select * from (select * from numbers_mt(1e8) group by number) group by number settings max_rows_to_read = 0;
 (Expression)
 ExpressionTransform × 16
   (Aggregating)
@@ -32,7 +32,7 @@ ExpressionTransform × 16
               ExpressionTransform × 16
                 (ReadFromSystemNumbers)
                 NumbersRange × 16 0 → 1
-explain pipeline select * from (select * from numbers_mt(1e8) group by number) order by number;
+explain pipeline select * from (select * from numbers_mt(1e8) group by number) order by number settings max_rows_to_read = 0;
 (Expression)
 ExpressionTransform
   (Sorting)
diff --git a/tests/queries/0_stateless/02353_simdjson_buffer_overflow.sql b/tests/queries/0_stateless/02353_simdjson_buffer_overflow.sql
index b324f834053..e7c6c272102 100644
--- a/tests/queries/0_stateless/02353_simdjson_buffer_overflow.sql
+++ b/tests/queries/0_stateless/02353_simdjson_buffer_overflow.sql
@@ -2,5 +2,6 @@
 
 SET max_execution_time = 3;
 SET timeout_overflow_mode = 'break';
+SET max_rows_to_read = 0, max_bytes_to_read = 0;
 
 SELECT count() FROM system.numbers_mt WHERE NOT ignore(JSONExtract('{' || repeat('"a":"b",', rand() % 10) || '"c":"d"}', 'a', 'String')) FORMAT Null;
diff --git a/tests/queries/0_stateless/02372_now_in_block.sql b/tests/queries/0_stateless/02372_now_in_block.sql
index aee4572ce8d..d0aec471801 100644
--- a/tests/queries/0_stateless/02372_now_in_block.sql
+++ b/tests/queries/0_stateless/02372_now_in_block.sql
@@ -1,3 +1,4 @@
+SET max_rows_to_read = 0, max_bytes_to_read = 0;
 SELECT count() FROM (SELECT DISTINCT nowInBlock(), nowInBlock('Pacific/Pitcairn') FROM system.numbers LIMIT 2);
 SELECT nowInBlock(1); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 SELECT nowInBlock(NULL) IS NULL;
diff --git a/tests/queries/0_stateless/02536_delta_gorilla_corruption.sql b/tests/queries/0_stateless/02536_delta_gorilla_corruption.sql
index a4e0965e329..3accc726d08 100644
--- a/tests/queries/0_stateless/02536_delta_gorilla_corruption.sql
+++ b/tests/queries/0_stateless/02536_delta_gorilla_corruption.sql
@@ -12,7 +12,7 @@ create table bug_delta_gorilla
 (value_bug UInt64 codec (Delta, Gorilla))
 engine = MergeTree
 order by tuple() SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi'
-as (select 0 from numbers(30000000));
+as (select 0 from numbers(20000000));
 
 select count(*)
 from bug_delta_gorilla