diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.reference b/tests/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.reference
index 3a176a17f5a..26be1c6ee8a 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.reference
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.reference
@@ -1,11 +1,11 @@
 4
-4
-8
+5
 8
+9
 -----
 4
-1
+2
 0
 0
 6
-2
+3
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.reference b/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.reference
index 3e002b3899c..1a68af74960 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.reference
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.reference
@@ -1,66 +1,66 @@
 ----HORIZONTAL MERGE TESTS----
 4
+5
+8
+9
+-----
 4
+3
 8
-8
+5
 -----
 4
 2
 8
-4
------
-4
-1
-8
-2
------
-4
-1
-8
-1
------
-4
-1
-4
-1
-8
-1
-42	42
-100	aaaa
-101	bbbb
-102	cccc
-103	dddd
-2
-----VERTICAL MERGE TESTS----
-4
-4
-8
-8
+3
 -----
 4
 2
 8
-4
------
-4
-1
-8
 2
 -----
 4
-1
+2
+4
+2
 8
 2
------
-4
-1
-4
-1
-8
-1
 42	42
 100	aaaa
 101	bbbb
 102	cccc
 103	dddd
 3
+----VERTICAL MERGE TESTS----
+4
+5
+8
+9
+-----
+4
+3
+8
+5
+-----
+4
+2
+8
+3
+-----
+4
+2
+8
+3
+-----
+4
+2
+4
+2
+8
+2
+42	42
+100	aaaa
+101	bbbb
+102	cccc
+103	dddd
+4
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.reference b/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.reference
index 5d5f3af28ab..b4ef1031186 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.reference
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.reference
@@ -1,32 +1,32 @@
 4
+5
+8
+9
+-----
 4
+3
 8
-8
+5
 -----
 4
 2
 8
-4
+3
 -----
 4
-1
-8
 2
+8
+3
 -----
 4
-1
-8
 2
------
 4
-1
-4
-1
-8
 2
+8
+3
 42	42
 100	aaaa
 101	bbbb
 102	cccc
 103	dddd
-3
+4
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_versioned_collapsing_merge_tree.reference b/tests/queries/0_stateless/00926_adaptive_index_granularity_versioned_collapsing_merge_tree.reference
index f93aae0225a..9b2c420f3d9 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_versioned_collapsing_merge_tree.reference
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_versioned_collapsing_merge_tree.reference
@@ -1,14 +1,14 @@
 4
-4
-8
+5
 8
+9
 -----
 4
-1
-0
-6
 2
------
+0
 6
 3
+-----
+6
+4
 0
diff --git a/tests/queries/0_stateless/01221_system_settings.reference b/tests/queries/0_stateless/01221_system_settings.reference
index 108d48d6051..10f29ea75d1 100644
--- a/tests/queries/0_stateless/01221_system_settings.reference
+++ b/tests/queries/0_stateless/01221_system_settings.reference
@@ -1,4 +1,4 @@
 send_timeout	300	0		\N	\N	0	Seconds
-storage_policy	default	0	Name of storage disk policy	String
+write_final_mark	1	0	Deprecated setting	Bool
 1
 1
diff --git a/tests/queries/0_stateless/01710_minmax_count_projection.sql b/tests/queries/0_stateless/01710_minmax_count_projection.sql
index 112487b219e..246caa2a962 100644
--- a/tests/queries/0_stateless/01710_minmax_count_projection.sql
+++ b/tests/queries/0_stateless/01710_minmax_count_projection.sql
@@ -38,7 +38,7 @@ select min(j) from no_final_mark;
 select min(j) from has_final_mark;
 select min(j) from mixed_final_mark;
 
-select min(j), max(j) from no_final_mark; -- {serverError TOO_MANY_ROWS}
+-- select min(j), max(j) from no_final_mark; -- {serverError TOO_MANY_ROWS}
 select min(j), max(j) from has_final_mark;
 
 set max_rows_to_read = 5001; -- one normal part 5000 + one minmax_count_projection part 1