diff --git a/docker/test/stateless/run.sh b/docker/test/stateless/run.sh
index b48b0731d92..a3f8f9eea60 100755
--- a/docker/test/stateless/run.sh
+++ b/docker/test/stateless/run.sh
@@ -310,7 +310,7 @@ function run_tests()
     try_run_with_retry 10 clickhouse-client -q "insert into system.zookeeper (name, path, value) values ('auxiliary_zookeeper2', '/test/chroot/', '')"
 
     set +e
-    timeout -s TERM --preserve-status 120m clickhouse-test --testname --shard --zookeeper --check-zookeeper-session --hung-check --print-time \
+    clickhouse-test --sequential --testname --shard --zookeeper --check-zookeeper-session --hung-check --print-time \
          --no-drop-if-fail --test-runs "$NUM_TRIES" "${ADDITIONAL_OPTIONS[@]}" 01710_aggregate_projections 01035_avg_weighted_long 00735_long_conditional 02911_join_on_nullsafe_optimization 02911_backup_restore_keeper_map 02552_siphash128_reference  2>&1 \
     | ts '%Y-%m-%d %H:%M:%S' \
     | tee -a test_output/test_result.txt
@@ -321,7 +321,7 @@ export -f run_tests
 
 
 # This should be enough to setup job and collect artifacts
-TIMEOUT=$((MAX_RUN_TIME - 300))
+TIMEOUT=$((MAX_RUN_TIME - 600))
 if [ "$NUM_TRIES" -gt "1" ]; then
     # We don't run tests with Ordinary database in PRs, only in master.
     # So run new/changed tests with Ordinary at least once in flaky check.
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index a90ffb79344..c735fc3bb04 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -2507,7 +2507,15 @@ def do_run_tests(jobs, test_suite: TestSuite):
                     )
                     future_seq.wait()
 
-                future.wait()
+                while not future.ready():
+                    sleep(0.1)
+                    if server_died.is_set():
+                        print("== Server died")
+                        sleep(5)
+                        pool.terminate()
+                        pool.close()
+
+                # future.wait()
                 print("future wait DONE")
         finally:
             print("pool.terminate")