diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index a0830ba5f12..d77d7233893 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -33,6 +33,12 @@ server_pid=none
 
 function stop_server
 {
+    if kill -0 -- "$server_pid"
+    then
+        echo "ClickHouse server pid '$server_pid' is not running"
+        return 0
+    fi
+
     for _ in {1..60}
     do
         if ! pkill -f "clickhouse-server" && ! kill -- "$server_pid" ; then break ; fi
@@ -167,8 +173,7 @@ clickhouse-client --version
 clickhouse-test --help
 
 mkdir -p "$FASTTEST_DATA"{,/client-config}
-cp -a "$FASTTEST_SOURCE/programs/server/"{config,users}.xml "$FASTTEST_DATA"
-cp -a "$FASTTEST_SOURCE/programs/server/"{config,users}.xml "$FASTTEST_DATA"
+cp -a "$FASTTEST_SOURCE/programs/server/"{config,users}.{xml,d} "$FASTTEST_DATA"
 "$FASTTEST_SOURCE/tests/config/install.sh" "$FASTTEST_DATA" "$FASTTEST_DATA/client-config"
 # doesn't support SSL
 rm -f "$FASTTEST_DATA/config.d/secure_ports.xml"