diff --git a/tests/performance/jit_aggregate_functions.xml b/tests/performance/jit_aggregate_functions.xml
index b1a937dfae9..3e99f6d9615 100644
--- a/tests/performance/jit_aggregate_functions.xml
+++ b/tests/performance/jit_aggregate_functions.xml
@@ -150,44 +150,6 @@
         FORMAT Null
     </query>
 
-    <query>
-        SELECT
-            {function}(value_1),
-            {function}(value_2),
-            {function}(value_3)
-        FROM {table}
-        FORMAT Null
-    </query>
-
-    <query>
-        SELECT
-            {function}(value_1),
-            {function}(value_2),
-            sum(toUInt256(value_3)),
-            {function}(value_3)
-        FROM {table}
-        FORMAT Null
-    </query>
-
-    <query>
-        SELECT
-            {function}If(value_1, predicate),
-            {function}If(value_2, predicate),
-            {function}If(value_3, predicate)
-        FROM {table}
-        FORMAT Null
-    </query>
-
-    <query>
-        SELECT
-            {function}If(value_1, predicate),
-            {function}If(value_2, predicate),
-            sumIf(toUInt256(value_3), predicate),
-            {function}If(value_3, predicate)
-        FROM {table}
-        FORMAT Null
-    </query>
-
     <query>
         SELECT
             {function}(value_1),
@@ -238,51 +200,6 @@
         FORMAT Null
     </query>
 
-    <query>
-        SELECT
-            {function}(value_1),
-            {function}(value_2),
-            {function}(value_3),
-            {function}(value_4),
-            {function}(value_5)
-        FROM {table}
-        FORMAT Null
-    </query>
-
-    <query>
-        SELECT
-            {function}(value_1),
-            {function}(value_2),
-            sum(toUInt256(value_3)),
-            {function}(value_3),
-            {function}(value_4),
-            {function}(value_5)
-        FROM {table}
-        FORMAT Null
-    </query>
-
-    <query>
-        SELECT
-            {function}If(value_1, predicate),
-            {function}If(value_2, predicate),
-            {function}If(value_3, predicate),
-            {function}If(value_4, predicate),
-            {function}If(value_5, predicate)
-        FROM {table}
-        FORMAT Null
-    </query>
-
-    <query>
-        SELECT
-            {function}If(value_1, predicate),
-            {function}If(value_2, predicate),
-            sumIf(toUInt256(value_3), predicate),
-            {function}If(value_3, predicate),
-            {function}If(value_4, predicate),
-            {function}If(value_5, predicate)
-        FROM {table}
-        FORMAT Null
-    </query>
 
     <query>
         SELECT
@@ -330,48 +247,6 @@
         FORMAT Null
     </query>
 
-    <query>
-        SELECT
-            {function}(WatchID),
-            {function}(CounterID),
-            {function}(ClientIP)
-        FROM hits_100m_single
-        FORMAT Null
-    </query>
-
-    <query>
-        SELECT
-            {function}(WatchID),
-            {function}(CounterID),
-            sum(toUInt256(ClientIP)),
-            {function}(ClientIP)
-        FROM hits_100m_single
-        FORMAT Null
-    </query>
-
-    <query>
-        SELECT
-            {function}(WatchID),
-            {function}(CounterID),
-            {function}(ClientIP),
-            {function}(IPNetworkID),
-            {function}(SearchEngineID)
-        FROM hits_100m_single
-        FORMAT Null
-    </query>
-
-    <query>
-        SELECT
-            {function}(WatchID),
-            {function}(CounterID),
-            sum(toUInt256(ClientIP)),
-            {function}(ClientIP),
-            {function}(IPNetworkID),
-            {function}(SearchEngineID)
-        FROM hits_100m_single
-        FORMAT Null
-    </query>
-
     <query>
         WITH (WatchID % 2 == 0) AS predicate
         SELECT
@@ -422,51 +297,5 @@
         FORMAT Null
     </query>
 
-    <query>
-        WITH (WatchID % 2 == 0) AS predicate
-        SELECT
-            {function}If(WatchID, predicate),
-            {function}If(CounterID, predicate),
-            {function}If(ClientIP, predicate)
-        FROM hits_100m_single
-        FORMAT Null
-    </query>
-
-    <query>
-        WITH (WatchID % 2 == 0) AS predicate
-        SELECT
-            {function}If(WatchID, predicate),
-            {function}If(CounterID, predicate),
-            sumIf(toUInt256(ClientIP), predicate),
-            {function}If(ClientIP, predicate)
-        FROM hits_100m_single
-        FORMAT Null
-    </query>
-
-    <query>
-        WITH (WatchID % 2 == 0) AS predicate
-        SELECT
-            {function}If(WatchID, predicate),
-            {function}If(CounterID, predicate),
-            {function}If(ClientIP, predicate),
-            {function}If(IPNetworkID, predicate),
-            {function}If(SearchEngineID, predicate)
-        FROM hits_100m_single
-        FORMAT Null
-    </query>
-
-    <query>
-        WITH (WatchID % 2 == 0) AS predicate
-        SELECT
-            {function}If(WatchID, predicate),
-            {function}If(CounterID, predicate),
-            sumIf(toUInt256(ClientIP), predicate),
-            {function}If(ClientIP, predicate),
-            {function}If(IPNetworkID, predicate),
-            {function}If(SearchEngineID, predicate)
-        FROM hits_100m_single
-        FORMAT Null
-    </query>
-
     <drop_query>DROP TABLE IF EXISTS {table}</drop_query>
 </test>
diff --git a/tests/performance/jit_aggregate_functions_no_key.xml b/tests/performance/jit_aggregate_functions_no_key.xml
new file mode 100644
index 00000000000..0d2577af97c
--- /dev/null
+++ b/tests/performance/jit_aggregate_functions_no_key.xml
@@ -0,0 +1,284 @@
+<test>
+    <preconditions>
+        <table_exists>hits_100m_single</table_exists>
+    </preconditions>
+
+    <settings>
+        <compile_aggregate_expressions>1</compile_aggregate_expressions>
+        <min_count_to_compile_aggregate_expression>0</min_count_to_compile_aggregate_expression>
+    </settings>
+
+    <create_query>
+        CREATE TABLE jit_test_memory (
+            key UInt64,
+            value_1 UInt64,
+            value_2 UInt64,
+            value_3 UInt64,
+            value_4 UInt64,
+            value_5 UInt64,
+            predicate UInt8
+        ) Engine = Memory
+    </create_query>
+
+    <create_query>
+        CREATE TABLE jit_test_merge_tree (
+            key UInt64,
+            value_1 UInt64,
+            value_2 UInt64,
+            value_3 UInt64,
+            value_4 UInt64,
+            value_5 UInt64,
+            predicate UInt8
+        ) Engine = MergeTree
+        ORDER BY key
+    </create_query>
+
+    <create_query>
+        CREATE TABLE jit_test_merge_tree_nullable (
+            key UInt64,
+            value_1 Nullable(UInt64),
+            value_2 Nullable(UInt64),
+            value_3 Nullable(UInt64),
+            value_4 Nullable(UInt64),
+            value_5 Nullable(UInt64),
+            predicate UInt8
+        ) Engine = Memory
+    </create_query>
+
+    <create_query>
+        CREATE TABLE jit_test_memory_nullable (
+            key UInt64,
+            value_1 Nullable(UInt64),
+            value_2 Nullable(UInt64),
+            value_3 Nullable(UInt64),
+            value_4 Nullable(UInt64),
+            value_5 Nullable(UInt64),
+            predicate UInt8
+        ) Engine = MergeTree
+        ORDER BY key
+    </create_query>
+
+    <substitutions>
+        <substitution>
+            <name>function</name>
+            <values>
+                <value>sum</value>
+                <value>min</value>
+                <value>max</value>
+                <value>avg</value>
+                <value>any</value>
+                <value>anyLast</value>
+                <value>count</value>
+                <value>groupBitOr</value>
+                <value>groupBitAnd</value>
+                <value>groupBitXor</value>
+            </values>
+        </substitution>
+
+        <substitution>
+            <name>table</name>
+            <values>
+                <value>jit_test_memory</value>
+                <value>jit_test_merge_tree</value>
+                <value>jit_test_memory_nullable</value>
+                <value>jit_test_merge_tree_nullable</value>
+            </values>
+        </substitution>
+
+        <substitution>
+            <name>group_scale</name>
+            <values>
+                <value>1000000</value>
+            </values>
+        </substitution>
+    </substitutions>
+
+    <fill_query>
+        INSERT INTO {table}
+            SELECT
+                number % 1000000,
+                number,
+                number,
+                number,
+                number,
+                number,
+                if (number % 2 == 0, 1, 0)
+            FROM
+                system.numbers_mt
+            LIMIT 100000000
+    </fill_query>
+
+    <query>
+        SELECT
+            {function}(value_1),
+            {function}(value_2),
+            {function}(value_3)
+        FROM {table}
+        FORMAT Null
+    </query>
+
+    <query>
+        SELECT
+            {function}(value_1),
+            {function}(value_2),
+            sum(toUInt256(value_3)),
+            {function}(value_3)
+        FROM {table}
+        FORMAT Null
+    </query>
+
+    <query>
+        SELECT
+            {function}If(value_1, predicate),
+            {function}If(value_2, predicate),
+            {function}If(value_3, predicate)
+        FROM {table}
+        FORMAT Null
+    </query>
+
+    <query>
+        SELECT
+            {function}If(value_1, predicate),
+            {function}If(value_2, predicate),
+            sumIf(toUInt256(value_3), predicate),
+            {function}If(value_3, predicate)
+        FROM {table}
+        FORMAT Null
+    </query>
+
+    <query>
+        SELECT
+            {function}(value_1),
+            {function}(value_2),
+            {function}(value_3),
+            {function}(value_4),
+            {function}(value_5)
+        FROM {table}
+        FORMAT Null
+    </query>
+
+    <query>
+        SELECT
+            {function}(value_1),
+            {function}(value_2),
+            sum(toUInt256(value_3)),
+            {function}(value_3),
+            {function}(value_4),
+            {function}(value_5)
+        FROM {table}
+        FORMAT Null
+    </query>
+
+    <query>
+        SELECT
+            {function}If(value_1, predicate),
+            {function}If(value_2, predicate),
+            {function}If(value_3, predicate),
+            {function}If(value_4, predicate),
+            {function}If(value_5, predicate)
+        FROM {table}
+        FORMAT Null
+    </query>
+
+    <query>
+        SELECT
+            {function}If(value_1, predicate),
+            {function}If(value_2, predicate),
+            sumIf(toUInt256(value_3), predicate),
+            {function}If(value_3, predicate),
+            {function}If(value_4, predicate),
+            {function}If(value_5, predicate)
+        FROM {table}
+        FORMAT Null
+    </query>
+
+    <query>
+        SELECT
+            {function}(WatchID),
+            {function}(CounterID),
+            {function}(ClientIP)
+        FROM hits_100m_single
+        FORMAT Null
+    </query>
+
+    <query>
+        SELECT
+            {function}(WatchID),
+            {function}(CounterID),
+            sum(toUInt256(ClientIP)),
+            {function}(ClientIP)
+        FROM hits_100m_single
+        FORMAT Null
+    </query>
+
+    <query>
+        SELECT
+            {function}(WatchID),
+            {function}(CounterID),
+            {function}(ClientIP),
+            {function}(IPNetworkID),
+            {function}(SearchEngineID)
+        FROM hits_100m_single
+        FORMAT Null
+    </query>
+
+    <query>
+        SELECT
+            {function}(WatchID),
+            {function}(CounterID),
+            sum(toUInt256(ClientIP)),
+            {function}(ClientIP),
+            {function}(IPNetworkID),
+            {function}(SearchEngineID)
+        FROM hits_100m_single
+        FORMAT Null
+    </query>
+
+    <query>
+        WITH (WatchID % 2 == 0) AS predicate
+        SELECT
+            {function}If(WatchID, predicate),
+            {function}If(CounterID, predicate),
+            {function}If(ClientIP, predicate)
+        FROM hits_100m_single
+        FORMAT Null
+    </query>
+
+    <query>
+        WITH (WatchID % 2 == 0) AS predicate
+        SELECT
+            {function}If(WatchID, predicate),
+            {function}If(CounterID, predicate),
+            sumIf(toUInt256(ClientIP), predicate),
+            {function}If(ClientIP, predicate)
+        FROM hits_100m_single
+        FORMAT Null
+    </query>
+
+    <query>
+        WITH (WatchID % 2 == 0) AS predicate
+        SELECT
+            {function}If(WatchID, predicate),
+            {function}If(CounterID, predicate),
+            {function}If(ClientIP, predicate),
+            {function}If(IPNetworkID, predicate),
+            {function}If(SearchEngineID, predicate)
+        FROM hits_100m_single
+        FORMAT Null
+    </query>
+
+    <query>
+        WITH (WatchID % 2 == 0) AS predicate
+        SELECT
+            {function}If(WatchID, predicate),
+            {function}If(CounterID, predicate),
+            sumIf(toUInt256(ClientIP), predicate),
+            {function}If(ClientIP, predicate),
+            {function}If(IPNetworkID, predicate),
+            {function}If(SearchEngineID, predicate)
+        FROM hits_100m_single
+        FORMAT Null
+    </query>
+
+    <drop_query>DROP TABLE IF EXISTS {table}</drop_query>
+</test>