diff --git a/dbms/tests/performance/order_by_decimals.xml b/dbms/tests/performance/order_by_decimals.xml
index faf2841e993..c6a7e7f72df 100644
--- a/dbms/tests/performance/order_by_decimals.xml
+++ b/dbms/tests/performance/order_by_decimals.xml
@@ -17,11 +17,11 @@
         </any_of>
     </stop_conditions>
 
-    <query>SELECT toInt32(number) AS n FROM numbers(1000000) ORDER BY n DESC</query>
-    <query>SELECT toDecimal32(number, 0) AS n FROM numbers(1000000) ORDER BY n</query>
+    <query>SELECT toInt32(number) AS n FROM numbers(1000000) ORDER BY n DESC FORMAT Null</query>
+    <query>SELECT toDecimal32(number, 0) AS n FROM numbers(1000000) ORDER BY n FORMAT Null</query>
 
-    <query>SELECT toDecimal32(number, 0) AS n FROM numbers(1000000) ORDER BY n DESC</query>
-    <query>SELECT toDecimal64(number, 8) AS n FROM numbers(1000000) ORDER BY n DESC</query>
-    <query>SELECT toDecimal128(number, 10) AS n FROM numbers(1000000) ORDER BY n DESC</query>
+    <query>SELECT toDecimal32(number, 0) AS n FROM numbers(1000000) ORDER BY n DESC FORMAT Null</query>
+    <query>SELECT toDecimal64(number, 8) AS n FROM numbers(1000000) ORDER BY n DESC FORMAT Null</query>
+    <query>SELECT toDecimal128(number, 10) AS n FROM numbers(1000000) ORDER BY n DESC FORMAT Null</query>
 
 </test>
diff --git a/docker/test/performance-comparison/entrypoint.sh b/docker/test/performance-comparison/entrypoint.sh
index 2be831884c9..51342a51599 100755
--- a/docker/test/performance-comparison/entrypoint.sh
+++ b/docker/test/performance-comparison/entrypoint.sh
@@ -16,7 +16,7 @@ echo Reference SHA is $ref_sha
 # Set python output encoding so that we can print queries with Russian letters.
 export PYTHONIOENCODING=utf-8
 
-../compare.sh 0 $ref_sha $PR_TO_TEST $SHA_TO_TEST > compare.log 2>&1
+../compare.sh 0 $ref_sha $PR_TO_TEST $SHA_TO_TEST > compare.log 2>&1 ||:
 
 7z a /output/output.7z *.log *.tsv
 cp compare.log /output
diff --git a/docker/test/performance-comparison/perf.py b/docker/test/performance-comparison/perf.py
index 00c3b1dcb6f..18bd196b9e4 100755
--- a/docker/test/performance-comparison/perf.py
+++ b/docker/test/performance-comparison/perf.py
@@ -1,5 +1,6 @@
 #!/usr/bin/python3
 
+import sys
 import itertools
 import clickhouse_driver
 import xml.etree.ElementTree as et