diff --git a/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
index f8e4826932c..65cb2db5738 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
@@ -1,7 +1,7 @@
 package org.testcontainers.clickhouse;
 
 import org.testcontainers.containers.JdbcDatabaseContainer;
-import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
@@ -56,11 +56,14 @@ public ClickHouseContainer(final DockerImageName dockerImageName) {
         dockerImageName.assertCompatibleWith(CLICKHOUSE_IMAGE_NAME);
 
         addExposedPorts(HTTP_PORT, NATIVE_PORT);
-        this.waitStrategy =
-            new HttpWaitStrategy()
+        waitingFor(
+            Wait
+                .forHttp("/")
+                .forPort(HTTP_PORT)
                 .forStatusCode(200)
                 .forResponsePredicate("Ok."::equals)
-                .withStartupTimeout(Duration.ofMinutes(1));
+                .withStartupTimeout(Duration.ofMinutes(1))
+        );
     }
 
     @Override
@@ -130,4 +133,9 @@ public ClickHouseContainer withDatabaseName(String databaseName) {
         this.databaseName = databaseName;
         return this;
     }
+
+    @Override
+    protected void waitUntilContainerStarted() {
+        getWaitStrategy().waitUntilReady(this);
+    }
 }