diff --git a/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/StrimziContainer.java b/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/StrimziContainer.java
index 40176b9..9031936 100644
--- a/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/StrimziContainer.java
+++ b/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/StrimziContainer.java
@@ -21,6 +21,7 @@
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
+import org.testcontainers.containers.wait.strategy.Wait;
 
 public class StrimziContainer extends GenericContainer {
     private static final String STRIMZI_CONTAINER = "strimzi/kafka:0.11.4-kafka-2.1.0";
@@ -45,12 +46,13 @@
                 }
         );
 
-
         withCommand("sh", "-c",
                 "bin/kafka-server-start.sh config/server.properties "
                         + "--override listeners=${KAFKA_LISTENERS} "
                         + "--override advertised.listeners=${KAFKA_ADVERTISED_LISTENERS} "
                         + "--override zookeeper.connect=${KAFKA_ZOOKEEPER_CONNECT}");
+
+        waitingFor(Wait.forListeningPort());
     }
 
 
diff --git a/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/StrimziService.java b/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/StrimziService.java
index 7b02eef..67699f0 100644
--- a/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/StrimziService.java
+++ b/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/StrimziService.java
@@ -46,13 +46,11 @@
     @Override
     public void initialize() {
         zookeeperContainer.start();
-        ContainerUtil.waitForInitialization(zookeeperContainer);
 
         String zookeeperConnect = "zookeeper:" + zookeeperContainer.getZookeeperPort();
         LOG.info("Apache Zookeeper running at address {}", zookeeperConnect);
 
         strimziContainer.start();
-        ContainerUtil.waitForInitialization(strimziContainer);
 
         LOG.info("Kafka bootstrap server running at address {}", getBootstrapServers());
     }
diff --git a/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/ZookeeperContainer.java b/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/ZookeeperContainer.java
index 45cb97f..4a3e422 100644
--- a/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/ZookeeperContainer.java
+++ b/tests/src/test/java/org/apache/camel/kafkaconnector/services/kafka/ZookeeperContainer.java
@@ -45,6 +45,8 @@
 
         withCommand( "sh", "-c",
                 "bin/zookeeper-server-start.sh config/zookeeper.properties");
+
+        waitingFor(Wait.forListeningPort());
     }