diff --git a/docker/test/stress/run.sh b/docker/test/stress/run.sh
index 793191b08da48b338e4df81fa03bc18d4f591a75..c0453bedc5a68ec86d5a17dc276bead2ba1f1e03 100755
--- a/docker/test/stress/run.sh
+++ b/docker/test/stress/run.sh
@@ -18,7 +18,7 @@ function wait_server()
             echo "Cannot start clickhouse-server"
             cat /var/log/clickhouse-server/stdout.log
             tail -n1000 /var/log/clickhouse-server/stderr.log
-            tail -n1000 /var/log/clickhouse-server/clickhouse-server.err.log
+            tail -n1000 /var/log/clickhouse-server/clickhouse-server.log
             break
         fi
         sleep 0.5
@@ -26,6 +26,24 @@ function wait_server()
     done
 }
 
+function stop()
+{
+    timeout 120 service clickhouse-server stop
+
+    # Wait for process to disappear from processlist and also try to kill zombies.
+    while kill -9 $(pidof clickhouse-server)
+    do
+        echo "Killed clickhouse-server"
+        sleep 0.5
+    done
+}
+
+function start()
+{
+    timeout 120 service clickhouse-server start
+    wait_server
+}
+
 ln -s /usr/share/clickhouse-test/config/log_queries.xml /etc/clickhouse-server/users.d/
 ln -s /usr/share/clickhouse-test/config/part_log.xml /etc/clickhouse-server/config.d/
 ln -s /usr/share/clickhouse-test/config/text_log.xml /etc/clickhouse-server/config.d/
@@ -34,19 +52,15 @@ echo "TSAN_OPTIONS='halt_on_error=1 history_size=7 ignore_noninstrumented_module
 echo "UBSAN_OPTIONS='print_stacktrace=1'" >> /etc/environment
 echo "ASAN_OPTIONS='malloc_context_size=10 verbosity=1 allocator_release_to_os_interval_ms=10000'" >> /etc/environment
 
-timeout 120 service clickhouse-server start
-
-wait_server
+start
 
 /s3downloader --dataset-names $DATASETS
 chmod 777 -R /var/lib/clickhouse
 clickhouse-client --query "ATTACH DATABASE IF NOT EXISTS datasets ENGINE = Ordinary"
 clickhouse-client --query "CREATE DATABASE IF NOT EXISTS test"
 
-timeout 120 service clickhouse-server stop
-timeout 120 service clickhouse-server start
-
-wait_server
+stop
+start
 
 clickhouse-client --query "SHOW TABLES FROM datasets"
 clickhouse-client --query "SHOW TABLES FROM test"
@@ -56,9 +70,7 @@ clickhouse-client --query "SHOW TABLES FROM test"
 
 ./stress --output-folder test_output --skip-func-tests "$SKIP_TESTS_OPTION"
 
-timeout 120 service clickhouse-server stop
-timeout 120 service clickhouse-server start
-
-wait_server
+stop
+start
 
 clickhouse-client --query "SELECT 'Server successfuly started'" > /test_output/alive_check.txt || echo 'Server failed to start' > /test_output/alive_check.txt