diff --git a/docker/test/stateless/Dockerfile b/docker/test/stateless/Dockerfile
index 226d27a9e6b..b66fa055e7b 100644
--- a/docker/test/stateless/Dockerfile
+++ b/docker/test/stateless/Dockerfile
@@ -51,13 +51,13 @@ ENV MAX_RUN_TIME=0
 
 
 # Download Minio-related binaries
-RUN wget 'https://dl.min.io/server/minio/release/linux-amd64/minio' -o /minio \
-    && chmod +x /minio \
-    && wget 'https://dl.min.io/client/mc/release/linux-amd64/mc' -o /minio \
-    && chmod +x /mc
+RUN wget 'https://dl.min.io/server/minio/release/linux-amd64/minio' \
+    && chmod +x ./minio \
+    && wget 'https://dl.min.io/client/mc/release/linux-amd64/mc' \
+    && chmod +x ./mc
 
-ENV MINIO_ROOT_USER=clickhouse
-ENV MINIO_ROOT_PASSWORD=clickhouse
+ENV MINIO_ROOT_USER="clickhouse"
+ENV MINIO_ROOT_PASSWORD="clickhouse"
 
 COPY run.sh /
 COPY process_functional_tests_result.py /
diff --git a/docker/test/stateless/setup_minio.sh b/docker/test/stateless/setup_minio.sh
index 06b434c0a96..5f0e2bab5be 100755
--- a/docker/test/stateless/setup_minio.sh
+++ b/docker/test/stateless/setup_minio.sh
@@ -2,12 +2,24 @@
 
 set -e -x -a
 
-/minio server --address ":11111" ./data > /dev/null &
+ls -lha
 
-/mc alias set clickminio http://localhost:11111 clickhouse clickhouse
-/mc admin user add clickminio test testtest
-/mc admin policy set clickminio readwrite user=test
-/mc mb clickminio/test
+mkdir -p ./data
+./minio server --address ":11111" ./data &
+
+while ! curl http://localhost:11111
+do
+  echo "Trying to connect to minio"
+  sleep 1
+done
+
+ps aux | grep minio
+lsof -i :11111
+
+./mc alias set clickminio http://localhost:11111 clickhouse clickhouse
+./mc admin user add clickminio test testtest
+./mc admin policy set clickminio readwrite user=test
+./mc mb clickminio/test
 
 
 # Upload data to Minio. By default after unpacking all tests will in