diff --git a/docker/test/performance-comparison/perf.py b/docker/test/performance-comparison/perf.py
index 37564c5ec40..5135dfd4f78 100755
--- a/docker/test/performance-comparison/perf.py
+++ b/docker/test/performance-comparison/perf.py
@@ -66,7 +66,8 @@ for e in root.findall('query'):
     if 'short' in e.attrib:
         new_queries, [is_short] = substitute_parameters([e.text], [[e.attrib['short']]])
         for i, s in enumerate(is_short):
-            if eval(s):
+            # Don't print this if we only need to print the queries.
+            if eval(s) and not args.print_queries:
                 print(f'short\t{i + len(test_queries)}')
     else:
         new_queries = substitute_parameters([e.text])
diff --git a/tests/performance/codecs_float_insert.xml b/tests/performance/codecs_float_insert.xml
index 40bda3e5458..ece6f43e8b8 100644
--- a/tests/performance/codecs_float_insert.xml
+++ b/tests/performance/codecs_float_insert.xml
@@ -1,4 +1,4 @@
-# FIXME this instability is abysmal, investigate the unstable queries
+<!-- FIXME this instability is abysmal, investigate the unstable queries -->
 <test max_ignored_relative_change="1.5">
     <settings>
         <allow_suspicious_codecs>1</allow_suspicious_codecs>
diff --git a/tests/performance/cryptographic_hashes.xml b/tests/performance/cryptographic_hashes.xml
index 13ded0b0159..bdf0be60115 100644
--- a/tests/performance/cryptographic_hashes.xml
+++ b/tests/performance/cryptographic_hashes.xml
@@ -1,7 +1,7 @@
 <test max_ignored_relative_change="1.0">
     <substitutions>
         <substitution>
-           <name>crypto_hash_func</name>
+           <name>hash_slow</name>
            <values>
                <value>MD5</value>
                <value>SHA1</value>
@@ -18,43 +18,43 @@
            </values>
         </substitution>
         <substitution>
-           <name>string</name>
+           <name>string_small</name>
            <values>
                <value>materialize('')</value>
                <value>toString(1000000000+number)</value>
            </values>
         </substitution>
         <substitution>
-           <name>string_slow</name>
+           <name>string_large</name>
            <values>
                <value>materialize('Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris sollicitudin nisi ac erat mollis dapibus. Maecenas leo purus, bibendum eu erat eget, iaculis molestie tortor. Phasellus maximus odio nec mauris ultrices dictum. Morbi efficitur nisl eget congue mollis. Vestibulum pharetra diam vitae urna interdum, eget ultricies justo sollicitudin. Nunc sit amet purus id leo tempus dignissim. Donec ac lacus ut orci tempus scelerisque quis ultricies nibh. Nullam lobortis, erat ac ullamcorper interdum, odio nisl elementum quam, ut malesuada massa nunc eget quam. Nam suscipit neque quis sapien ultricies imperdiet. Maecenas augue libero, finibus tristique sagittis et, semper nec arcu. Morbi non tortor ultrices, sollicitudin justo sed, accumsan ligula. Nullam at ipsum in nibh auctor ullamcorper. Nullam laoreet neque id lorem condimentum tincidunt. Nullam vel orci nibh. Ut sit amet sem faucibus, fringilla orci at, lacinia enim. Mauris imperdiet ex id scelerisque eleifend. Ut tincidunt massa nibh, viverra pharetra metus')</value>
            </values>
         </substitution>
         <substitution>
-           <name>table_fast</name>
+           <name>numbers_small</name>
            <values>
-               <value>zeros(10000000)</value>
-               <value>zeros_mt(100000000)</value>
+               <value>numbers(10000)</value>
+               <value>numbers_mt(100000)</value>
            </values>
         </substitution>
         <substitution>
-           <name>table</name>
+           <name>numbers_medium</name>
+           <values>
+               <value>numbers(100000)</value>
+               <value>numbers_mt(1000000)</value>
+           </values>
+        </substitution>
+        <substitution>
+           <name>numbers_large</name>
            <values>
                <value>numbers(1000000)</value>
                <value>numbers_mt(10000000)</value>
            </values>
         </substitution>
-        <substitution>
-           <name>table_slow</name>
-           <values>
-               <value>zeros(100000)</value>
-               <value>zeros_mt(1000000)</value>
-           </values>
-        </substitution>
     </substitutions>
 
-    <query>SELECT ignore({crypto_hash_func}({string})) FROM {table} FORMAT Null</query>
-    <query>SELECT ignore({crypto_hash_func}({string_slow})) FROM {table_slow} FORMAT Null</query>
-    <query>SELECT ignore({hash_fast}({string})) FROM {table_fast} FORMAT Null</query>
-    <query>SELECT ignore({hash_fast}({string_slow})) FROM {table} FORMAT Null</query>
+    <query>SELECT ignore({hash_fast}({string_small})) FROM {numbers_medium} FORMAT Null</query>
+    <query>SELECT ignore({hast_slow}({string_large})) FROM {numbers_small} FORMAT Null</query>
+    <query>SELECT ignore({hash_fast}({string_small})) FROM {numbers_large} FORMAT Null</query>
+    <query>SELECT ignore({hash_fast}({string_large})) FROM {numbers_medium} FORMAT Null</query>
 </test>
diff --git a/tests/performance/decimal_aggregates.xml b/tests/performance/decimal_aggregates.xml
index e14054b218e..88a96770c96 100644
--- a/tests/performance/decimal_aggregates.xml
+++ b/tests/performance/decimal_aggregates.xml
@@ -1,6 +1,6 @@
 <test>
     <create_query>CREATE TABLE t (x UInt64, d32 Decimal32(3), d64 Decimal64(4), d128 Decimal128(5)) ENGINE = Memory</create_query>
-    <fill_query>INSERT INTO t SELECT number AS x, x AS d32, x AS d64, x d128 FROM numbers(10000000)</fill_query>
+    <fill_query>INSERT INTO t SELECT number AS x, x / 10 AS d32, x AS d64, x d128 FROM numbers(10000000)</fill_query>
     <drop_query>DROP TABLE IF EXISTS t</drop_query>
 
     <query>SELECT min(d32), max(d32), argMin(x, d32), argMax(x, d32) FROM t</query>
diff --git a/tests/performance/string_sort.xml b/tests/performance/string_sort.xml
index cb5b2902b6d..94e115ff310 100644
--- a/tests/performance/string_sort.xml
+++ b/tests/performance/string_sort.xml
@@ -42,12 +42,11 @@
     <query><![CDATA[SELECT {str1} FROM hits_100m_single ORDER BY {str1}, CounterID LIMIT 1500 format Null]]></query>
     <query><![CDATA[SELECT {str1} FROM hits_100m_single ORDER BY {str1}, CounterID LIMIT 2000 format Null]]></query>
     <query><![CDATA[SELECT {str1} FROM hits_100m_single ORDER BY {str1}, CounterID LIMIT 5000 format Null]]></query>
-    <query><![CDATA[SELECT {str1} FROM hits_100m_single ORDER BY {str1}, CounterID LIMIT 10000 format Null]]></query>
-    <query><![CDATA[SELECT {str1} FROM hits_100m_single ORDER BY {str1}, CounterID LIMIT 65535 format Null settings max_block_size = 65536]]></query>
+    <query><![CDATA[SELECT {str1} FROM hits_10m_single ORDER BY {str1}, CounterID LIMIT 10000 format Null]]></query>
+    <query><![CDATA[SELECT {str1} FROM hits_10m_single ORDER BY {str1}, CounterID LIMIT 65535 format Null settings max_block_size = 65536]]></query>
 
-    <query><![CDATA[SELECT {str1} FROM hits_100m_single ORDER BY {str1} LIMIT 9000000, 10]]></query>
-
-    <query><![CDATA[SELECT {str1}, {str2} FROM hits_100m_single ORDER BY {str1}, {str2} LIMIT 10]]></query>
-    <query><![CDATA[SELECT {str1}, {str2} FROM hits_100m_single ORDER BY {str1}, {str2} LIMIT 9000000, 10]]></query>
+    <query><![CDATA[SELECT {str1} FROM hits_10m_single ORDER BY {str1} LIMIT 9000000, 10 FORMAT Null]]></query>
 
+    <query><![CDATA[SELECT {str1}, {str2} FROM hits_100m_single ORDER BY {str1}, {str2} LIMIT 10 FORMAT Null]]></query>
+    <query><![CDATA[SELECT {str1}, {str2} FROM hits_10m_single ORDER BY {str1}, {str2} LIMIT 9000000, 10 FORMAT Null]]></query>
 </test>