diff --git a/test/jackdaw/client_test.clj b/test/jackdaw/client_test.clj
index 20b3f67f..61e7b7d4 100644
--- a/test/jackdaw/client_test.clj
+++ b/test/jackdaw/client_test.clj
@@ -160,7 +160,7 @@
 
 (deftest ^:integration consumer-test
   (let [config {"group.id" "jackdaw-client-test-consumer-test"
-                "bootstrap.servers" "kafka:9092"
+                "bootstrap.servers" (str (utils/bootstrap-servers) ":9092")
                 "key.deserializer" "org.apache.kafka.common.serialization.StringDeserializer"
                 "value.deserializer" "org.apache.kafka.common.serialization.StringDeserializer"}
         key-serde (:key-serde foo-topic)
diff --git a/test/jackdaw/test/commands/write_test.clj b/test/jackdaw/test/commands/write_test.clj
index d4ac8119..c9d6b1a5 100644
--- a/test/jackdaw/test/commands/write_test.clj
+++ b/test/jackdaw/test/commands/write_test.clj
@@ -4,6 +4,7 @@
    [jackdaw.test.transports :as trns]
    [jackdaw.test.transports.kafka]
    [jackdaw.test.serde :as serde]
+   [jackdaw.utils :as utils]
    [clojure.test :refer [deftest is testing]])
   (:import
     [clojure.lang ExceptionInfo]))
@@ -40,7 +41,7 @@
                    :key-serde :long
                    :value-serde :json}))
 
-(def kafka-config {"bootstrap.servers" "kafka:9092"
+(def kafka-config {"bootstrap.servers" (str (utils/bootstrap-servers) ":9092")
                    "group.id" "kafka-write-test"})
 
 (defn with-transport
diff --git a/test/jackdaw/test/transports/rest_proxy_test.clj b/test/jackdaw/test/transports/rest_proxy_test.clj
index a8d48060..6dbd473a 100644
--- a/test/jackdaw/test/transports/rest_proxy_test.clj
+++ b/test/jackdaw/test/transports/rest_proxy_test.clj
@@ -21,7 +21,7 @@
                    "group.id" "kafka-write-test"})
 
 (def +real-rest-proxy-url+
-  "http://kafka-rest:8082")
+  (format "http://%s:8082" (utils/kafka-rest-proxy-host)))
 
 (defn rest-proxy-config
   [group-id]
@@ -31,7 +31,7 @@
 (defn kstream-config
   [app app-id]
   {:topology app
-   :config {"bootstrap.servers" "kafka:9092"
+   :config {"bootstrap.servers" (str (utils/bootstrap-servers) ":9092")
             "application.id" app-id}})
 
 (defn echo-stream
diff --git a/test/jackdaw/test_test.clj b/test/jackdaw/test_test.clj
index 737ca6ad..0e05e821 100644
--- a/test/jackdaw/test_test.clj
+++ b/test/jackdaw/test_test.clj
@@ -235,8 +235,7 @@
     (try
       (jd.test/with-test-machine (trns/transport {:type :mock
                                                   :driver (jd.test/mock-test-driver (echo-stream test-in test-out)
-                                                                                    {"bootstrap.servers" (str (utils/bootstrap-servers) ":9092")
-                                                                                     "application.id" "test-echo-stream"})
+                                                                                    (assoc kafka-config "application.id" "test-echo-stream"))
                                                   :topics {:in test-in
                                                            :out test-out}})
         (fn [machine]