diff --git a/tests/queries/1_stateful/00004_top_counters.reference b/tests/queries/1_stateful/00004_top_counters.reference
index cf2824e45b0..e2d584170c0 100644
--- a/tests/queries/1_stateful/00004_top_counters.reference
+++ b/tests/queries/1_stateful/00004_top_counters.reference
@@ -8,3 +8,13 @@
 59183	85379
 33010362	77807
 800784	77492
+1704509	523264
+732797	475698
+598875	337212
+792887	252197
+3807842	196036
+25703952	147211
+716829	90109
+59183	85379
+33010362	77807
+800784	77492
diff --git a/tests/queries/1_stateful/00004_top_counters.sql b/tests/queries/1_stateful/00004_top_counters.sql
index 045f940da42..abdd5ac794a 100644
--- a/tests/queries/1_stateful/00004_top_counters.sql
+++ b/tests/queries/1_stateful/00004_top_counters.sql
@@ -1 +1,2 @@
-SELECT CounterID, count() AS c FROM test.hits GROUP BY CounterID ORDER BY c DESC LIMIT 10
+SELECT CounterID, count() AS c FROM test.hits GROUP BY CounterID ORDER BY c DESC LIMIT 10;
+SELECT CounterID, count() AS c FROM test.hits GROUP BY CounterID ORDER BY c DESC LIMIT 10 SETTINGS optimize_aggregation_in_order = 1
diff --git a/tests/queries/1_stateful/00047_bar.reference b/tests/queries/1_stateful/00047_bar.reference
index 61999ae73c9..c038f59946e 100644
--- a/tests/queries/1_stateful/00047_bar.reference
+++ b/tests/queries/1_stateful/00047_bar.reference
@@ -98,3 +98,103 @@
 7901143	10022	█▌
 194599	9997	█▌
 21052498	9780	█▍
+1704509	523264	████████████████████████████████████████████████████████████████████████████████
+732797	475698	████████████████████████████████████████████████████████████████████████▋
+598875	337212	███████████████████████████████████████████████████▌
+792887	252197	██████████████████████████████████████▌
+3807842	196036	█████████████████████████████▊
+25703952	147211	██████████████████████▌
+716829	90109	█████████████▋
+59183	85379	█████████████
+33010362	77807	███████████▊
+800784	77492	███████████▋
+20810645	73213	███████████▏
+25843850	68945	██████████▌
+23447120	67570	██████████▎
+14739804	64174	█████████▋
+32077710	60456	█████████▏
+22446879	58389	████████▊
+170282	57017	████████▋
+11482817	52345	████████
+63469	52142	███████▊
+29103473	47758	███████▎
+10136747	44080	██████▋
+27528801	43395	██████▋
+10581377	43279	██████▌
+9841201	40581	██████▏
+20310963	37562	█████▋
+17337667	34301	█████▏
+28600281	32776	█████
+32046685	28788	████▍
+10130880	26603	████
+8676831	25733	███▊
+53230	25595	███▊
+20271226	25585	███▊
+17420663	25496	███▊
+631207	25270	███▋
+633130	24744	███▋
+14324015	23349	███▌
+8537965	21270	███▎
+11285298	20825	███▏
+14937615	20788	███▏
+185050	20785	███▏
+16368233	19897	███
+81602	19724	███
+62896	19717	███
+12967664	19402	██▊
+15996597	18557	██▋
+4379238	18370	██▋
+90982	17443	██▋
+18211045	17390	██▋
+14625884	17302	██▋
+12864910	17279	██▋
+126096	16959	██▌
+30296134	16849	██▌
+26360482	16175	██▍
+17788950	16017	██▍
+5928716	15340	██▎
+15469035	15171	██▎
+29732125	15146	██▎
+32946244	15104	██▎
+20957241	14719	██▎
+9495695	14584	██▏
+29241146	14540	██▏
+109805	14199	██▏
+26905788	13972	██▏
+212019	13930	██▏
+171509	13792	██
+23913162	13615	██
+1861993	13509	██
+125776	13308	██
+11312316	13181	██
+32667326	13181	██
+28628973	12922	█▊
+122804	12520	█▊
+12322758	12352	█▊
+1301819	12283	█▊
+10769545	12183	█▋
+21566939	12170	█▋
+28905364	12158	█▋
+4250765	12049	█▋
+15009727	11818	█▋
+12761932	11733	█▋
+26995888	11658	█▋
+12759346	11514	█▋
+1507911	11452	█▋
+968488	11444	█▋
+15736172	11358	█▋
+54310	11193	█▋
+17027391	11047	█▋
+17439919	10936	█▋
+4480860	10747	█▋
+26738469	10738	█▋
+9986231	10656	█▋
+1539995	10655	█▋
+214556	10625	█▌
+219339	10522	█▌
+3266	10503	█▌
+30563429	10128	█▌
+1960469	10098	█▌
+7901143	10022	█▌
+194599	9997	█▌
+21052498	9780	█▍
diff --git a/tests/queries/1_stateful/00047_bar.sql b/tests/queries/1_stateful/00047_bar.sql
index c7310763525..37c420b91ff 100644
--- a/tests/queries/1_stateful/00047_bar.sql
+++ b/tests/queries/1_stateful/00047_bar.sql
@@ -1 +1,2 @@
-SELECT CounterID, count() AS c, bar(c, 0, 523264) FROM test.hits GROUP BY CounterID ORDER BY c DESC, CounterID ASC LIMIT 100
+SELECT CounterID, count() AS c, bar(c, 0, 523264) FROM test.hits GROUP BY CounterID ORDER BY c DESC, CounterID ASC LIMIT 100;
+SELECT CounterID, count() AS c, bar(c, 0, 523264) FROM test.hits GROUP BY CounterID ORDER BY c DESC, CounterID ASC LIMIT 100 SETTINGS optimize_aggregation_in_order = 1
diff --git a/tests/queries/1_stateful/00049_max_string_if.reference b/tests/queries/1_stateful/00049_max_string_if.reference
index f87bc6d1fd2..6897a773c87 100644
--- a/tests/queries/1_stateful/00049_max_string_if.reference
+++ b/tests/queries/1_stateful/00049_max_string_if.reference
@@ -18,3 +18,23 @@
 11482817	52345	я скачать игры
 63469	52142	яндекс марте рокус надписями я любимому у полосы фото минск
 29103473	47758	
+1704509	523264	نيك امريكي نيك افلام سكس جامد
+732797	475698	نيك سكس سيحاق
+598875	337212	سکس باصات
+792887	252197	№2267 отзыв
+3807842	196036	ярмаркетовара 200кг купить по неделю тебелье
+25703952	147211	
+716829	90109	яндекс повыш
+59183	85379	франция машину угловы крузер из кофе
+33010362	77807	ярмаркетовара 200кг купить по неделю тебелье
+800784	77492	ярмаркур смерти теплицы из чего
+20810645	73213	ярмаркетовара 200кг купить по неделю тебе перево метиков детский
+25843850	68945	электросчет-фактура
+23447120	67570	южная степанов
+14739804	64174	штангал волк
+32077710	60456	
+22446879	58389	فیلم سكس امريكي نيك
+170282	57017	ل افلام السكس
+11482817	52345	я скачать игры
+63469	52142	яндекс марте рокус надписями я любимому у полосы фото минск
+29103473	47758	
diff --git a/tests/queries/1_stateful/00049_max_string_if.sql b/tests/queries/1_stateful/00049_max_string_if.sql
index af87123ef02..5c6d4274bab 100644
--- a/tests/queries/1_stateful/00049_max_string_if.sql
+++ b/tests/queries/1_stateful/00049_max_string_if.sql
@@ -1 +1,2 @@
-SELECT CounterID, count(), maxIf(SearchPhrase, notEmpty(SearchPhrase)) FROM test.hits GROUP BY CounterID ORDER BY count() DESC LIMIT 20
+SELECT CounterID, count(), maxIf(SearchPhrase, notEmpty(SearchPhrase)) FROM test.hits GROUP BY CounterID ORDER BY count() DESC LIMIT 20;
+SELECT CounterID, count(), maxIf(SearchPhrase, notEmpty(SearchPhrase)) FROM test.hits GROUP BY CounterID ORDER BY count() DESC LIMIT 20 SETTINGS optimize_aggregation_in_order = 1
diff --git a/tests/queries/1_stateful/00050_min_max.reference b/tests/queries/1_stateful/00050_min_max.reference
index ab47fd7a69a..91473c4ea17 100644
--- a/tests/queries/1_stateful/00050_min_max.reference
+++ b/tests/queries/1_stateful/00050_min_max.reference
@@ -18,3 +18,23 @@
 11482817	4611708000353743073	9223337838355779113
 63469	4611695097019173921	9223353530156141191
 29103473	4611744585914335132	9223333530281362537
+1704509	4611700827100483880	9223360787015464643
+732797	4611701940806302259	9223355550934604746
+598875	4611701407242345792	9223362250391155632
+792887	4611699550286611812	9223290551912005343
+3807842	4611710821592843606	9223326163906184987
+25703952	4611709443519524003	9223353913449113943
+716829	4611852156092872082	9223361623076951140
+59183	4611730685242027332	9223354909338698162
+33010362	4611704682869732882	9223268545373999677
+800784	4611752907938305166	9223340418389788041
+20810645	4611712185532639162	9223218900001937412
+25843850	4611690025407720929	9223346023778617822
+23447120	4611796031755620254	9223329309291309758
+14739804	4611692230555590277	9223313509005166531
+32077710	4611884228437061959	9223352444952988904
+22446879	4611846229717089436	9223124373140579096
+170282	4611833225706935900	9223371583739401906
+11482817	4611708000353743073	9223337838355779113
+63469	4611695097019173921	9223353530156141191
+29103473	4611744585914335132	9223333530281362537
diff --git a/tests/queries/1_stateful/00050_min_max.sql b/tests/queries/1_stateful/00050_min_max.sql
index 4c45f6fffa6..1ca93a5d620 100644
--- a/tests/queries/1_stateful/00050_min_max.sql
+++ b/tests/queries/1_stateful/00050_min_max.sql
@@ -1 +1,2 @@
-SELECT CounterID, min(WatchID), max(WatchID) FROM test.hits GROUP BY CounterID ORDER BY count() DESC LIMIT 20
+SELECT CounterID, min(WatchID), max(WatchID) FROM test.hits GROUP BY CounterID ORDER BY count() DESC LIMIT 20;
+SELECT CounterID, min(WatchID), max(WatchID) FROM test.hits GROUP BY CounterID ORDER BY count() DESC LIMIT 20 SETTINGS optimize_aggregation_in_order = 1
diff --git a/tests/queries/1_stateful/00051_min_max_array.reference b/tests/queries/1_stateful/00051_min_max_array.reference
index a5f1b6cdfef..b5555954099 100644
--- a/tests/queries/1_stateful/00051_min_max_array.reference
+++ b/tests/queries/1_stateful/00051_min_max_array.reference
@@ -18,3 +18,23 @@
 11482817	52345	[]	[]	[]
 63469	52142	[]	[]	[]
 29103473	47758	[6185451]	[]	[6185451]
+1704509	523264	[271264]	[]	[271264]
+732797	475698	[]	[]	[]
+598875	337212	[]	[]	[]
+792887	252197	[2094893,2028343]	[]	[1272031]
+3807842	196036	[1710269]	[]	[1134660]
+25703952	147211	[]	[]	[]
+716829	90109	[4186138]	[]	[1800405]
+59183	85379	[]	[]	[]
+33010362	77807	[]	[]	[]
+800784	77492	[4002316]	[]	[1270480]
+20810645	73213	[]	[]	[]
+25843850	68945	[4028285]	[]	[4028285]
+23447120	67570	[6503091,2762273]	[]	[2098132]
+14739804	64174	[4180720]	[]	[664490]
+32077710	60456	[]	[]	[]
+22446879	58389	[]	[]	[]
+170282	57017	[4166114]	[]	[34386,1240412,1248634,1616213,2928740,1458582]
+11482817	52345	[]	[]	[]
+63469	52142	[]	[]	[]
+29103473	47758	[6185451]	[]	[6185451]
diff --git a/tests/queries/1_stateful/00051_min_max_array.sql b/tests/queries/1_stateful/00051_min_max_array.sql
index 1027586372d..adf44fb9c22 100644
--- a/tests/queries/1_stateful/00051_min_max_array.sql
+++ b/tests/queries/1_stateful/00051_min_max_array.sql
@@ -1 +1,2 @@
-SELECT CounterID, count(), max(GoalsReached), min(GoalsReached), minIf(GoalsReached, notEmpty(GoalsReached)) FROM test.hits GROUP BY CounterID ORDER BY count() DESC LIMIT 20
+SELECT CounterID, count(), max(GoalsReached), min(GoalsReached), minIf(GoalsReached, notEmpty(GoalsReached)) FROM test.hits GROUP BY CounterID ORDER BY count() DESC LIMIT 20;
+SELECT CounterID, count(), max(GoalsReached), min(GoalsReached), minIf(GoalsReached, notEmpty(GoalsReached)) FROM test.hits GROUP BY CounterID ORDER BY count() DESC LIMIT 20 SETTINGS optimize_aggregation_in_order = 1
diff --git a/tests/queries/1_stateful/00087_where_0.sql b/tests/queries/1_stateful/00087_where_0.sql
index c55617d2245..33c325e53b8 100644
--- a/tests/queries/1_stateful/00087_where_0.sql
+++ b/tests/queries/1_stateful/00087_where_0.sql
@@ -1,3 +1,5 @@
 SET max_rows_to_read = 1000;
 SELECT CounterID, uniq(UserID) FROM test.hits WHERE 0 != 0 GROUP BY CounterID;
+SELECT CounterID, uniq(UserID) FROM test.hits WHERE 0 != 0 GROUP BY CounterID SETTINGS optimize_aggregation_in_order = 1;
 SELECT CounterID, uniq(UserID) FROM test.hits WHERE 0 AND CounterID = 1704509 GROUP BY CounterID;
+SELECT CounterID, uniq(UserID) FROM test.hits WHERE 0 AND CounterID = 1704509 GROUP BY CounterID SETTINGS optimize_aggregation_in_order = 1;
diff --git a/tests/queries/1_stateful/00149_quantiles_timing_distributed.reference b/tests/queries/1_stateful/00149_quantiles_timing_distributed.reference
index 8ac5f01c7cc..e31a1e90d87 100644
--- a/tests/queries/1_stateful/00149_quantiles_timing_distributed.reference
+++ b/tests/queries/1_stateful/00149_quantiles_timing_distributed.reference
@@ -1 +1,2 @@
 10726001768429413598
+10726001768429413598
diff --git a/tests/queries/1_stateful/00149_quantiles_timing_distributed.sql b/tests/queries/1_stateful/00149_quantiles_timing_distributed.sql
index b195518e1e7..dc63cb5867f 100644
--- a/tests/queries/1_stateful/00149_quantiles_timing_distributed.sql
+++ b/tests/queries/1_stateful/00149_quantiles_timing_distributed.sql
@@ -1 +1,2 @@
 SELECT sum(cityHash64(*)) FROM (SELECT CounterID, quantileTiming(0.5)(SendTiming), count() FROM remote('127.0.0.{1,2,3,4,5,6,7,8,9,10}', test.hits) WHERE SendTiming != -1 GROUP BY CounterID);
+SELECT sum(cityHash64(*)) FROM (SELECT CounterID, quantileTiming(0.5)(SendTiming), count() FROM remote('127.0.0.{1,2,3,4,5,6,7,8,9,10}', test.hits) WHERE SendTiming != -1 GROUP BY CounterID) SETTINGS optimize_aggregation_in_order = 1;
diff --git a/tests/queries/1_stateful/00150_quantiles_timing_precision.reference b/tests/queries/1_stateful/00150_quantiles_timing_precision.reference
index 09aaf8449dc..79ef24af591 100644
--- a/tests/queries/1_stateful/00150_quantiles_timing_precision.reference
+++ b/tests/queries/1_stateful/00150_quantiles_timing_precision.reference
@@ -1 +1,2 @@
 4379238	1868	1879	5755	0.006
+4379238	1868	1879	5755	0.006
diff --git a/tests/queries/1_stateful/00150_quantiles_timing_precision.sql b/tests/queries/1_stateful/00150_quantiles_timing_precision.sql
index 7d5b27fafd3..e858bcf34ff 100644
--- a/tests/queries/1_stateful/00150_quantiles_timing_precision.sql
+++ b/tests/queries/1_stateful/00150_quantiles_timing_precision.sql
@@ -1 +1,2 @@
 SELECT CounterID, quantileTiming(0.5)(SendTiming) AS qt, least(30000, quantileExact(0.5)(SendTiming)) AS qe, count() AS c, round(abs(qt - qe) / greatest(qt, qe) AS diff, 3) AS rounded_diff FROM test.hits WHERE SendTiming != -1 GROUP BY CounterID HAVING diff != 0 ORDER BY diff DESC;
+SELECT CounterID, quantileTiming(0.5)(SendTiming) AS qt, least(30000, quantileExact(0.5)(SendTiming)) AS qe, count() AS c, round(abs(qt - qe) / greatest(qt, qe) AS diff, 3) AS rounded_diff FROM test.hits WHERE SendTiming != -1 GROUP BY CounterID HAVING diff != 0 ORDER BY diff DESC SETTINGS optimize_aggregation_in_order = 1;