diff --git a/docker/test/stateful/run.sh b/docker/test/stateful/run.sh
index 82587efcb3d1..806b57c4616a 100755
--- a/docker/test/stateful/run.sh
+++ b/docker/test/stateful/run.sh
@@ -78,7 +78,7 @@ function start()
             tail -n1000 /var/log/clickhouse-server/clickhouse-server.log
             break
         fi
-        timeout_with_logging 120 service clickhouse-server start
+        timeout 120 service clickhouse-server start
         sleep 0.5
         counter=$((counter + 1))
     done
@@ -163,7 +163,7 @@ function run_tests()
 }
 
 export -f run_tests
-timeout_with_logging "$MAX_RUN_TIME" bash -c run_tests ||:
+timeout "$MAX_RUN_TIME" bash -c run_tests ||:
 
 echo "Files in current directory"
 ls -la ./
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index 1ba67a3b2f43..1df2bc8271fb 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -278,6 +278,7 @@ def need_retry(args, stdout, stderr, total_time):
         msg in stderr for msg in MESSAGES_TO_RETRY
     )
 
+
 def get_processlist_size(args):
     if args.replicated_database:
         return int(
@@ -286,27 +287,26 @@ def get_processlist_size(args):
                 """
                 SELECT
                     count()
-                FROM 
+                FROM
                     FROM system.processes
                 WHERE query NOT LIKE '%system.processes%'
-                FORMAT Vertical
                 """,
-                ).strip()
+            ).strip()
         )
     else:
         return int(
-                clickhouse_execute(
+            clickhouse_execute(
                 args,
                 """
-            SELECT
-                count()
-            FROM system.processes 
-            WHERE query NOT LIKE '%system.processes%'
-            FORMAT Vertical
-            """,
+                SELECT
+                    count()
+                FROM system.processes
+                WHERE query NOT LIKE '%system.processes%'
+                """,
             ).strip()
         )
 
+
 def get_processlist_with_stacktraces(args):
     if args.replicated_database:
         return clickhouse_execute(
@@ -356,7 +356,6 @@ def get_processlist_with_stacktraces(args):
         )
 
 
-
 def get_transactions_list(args):
     try:
         if args.replicated_database:
@@ -2448,7 +2447,7 @@ def main(args):
 
     if args.hung_check:
         # Some queries may execute in background for some time after test was finished. This is normal.
-        print("Checking the hung queries: ", end='')
+        print("Checking the hung queries: ", end="")
         hung_count = 0
         try:
             deadline = datetime.now() + timedelta(seconds=90)
@@ -2457,16 +2456,18 @@ def main(args):
                 if hung_count == 0:
                     print(" done")
                     break
-                print(". ", end='')
+                print(". ", end="")
         except Exception as e:
             print(
                 colored(
-                    "\nHung check failed. Failed to get processlist size: " + str(e), args, "red", attrs=["bold"]
+                    "\nHung check failed. Failed to get processlist size: " + str(e),
+                    args,
+                    "red",
+                    attrs=["bold"],
                 )
             )
             exit_code.value = 1
 
-
         processlist = ""
         if hung_count > 0:
             try:
@@ -2474,7 +2475,11 @@ def main(args):
             except Exception as e:
                 print(
                     colored(
-                        "\nHung check failed. Failed to get processlist with stacktraces: " + str(e), args, "red", attrs=["bold"]
+                        "\nHung check failed. Failed to get processlist with stacktraces: "
+                        + str(e),
+                        args,
+                        "red",
+                        attrs=["bold"],
                     )
                 )
                 exit_code.value = 1