diff --git a/.vib/kafka/goss/kafka.yaml b/.vib/kafka/goss/kafka.yaml
index 32dd42f4a84b..6cdaff03efb6 100644
--- a/.vib/kafka/goss/kafka.yaml
+++ b/.vib/kafka/goss/kafka.yaml
@@ -27,3 +27,9 @@ file:
     filetype: file
     contents:
       - "![-]loggc"
+{{ if not (regexMatch "^4.+" .Env.APP_VERSION) }}
+command:
+  check-wait-for-port-binary:
+    exec: which wait-for-port
+    exit-status: 0
+{{ end }}
diff --git a/.vib/kafka/goss/vars.yaml b/.vib/kafka/goss/vars.yaml
index 71fde235d7fd..b2d29bfb6f73 100644
--- a/.vib/kafka/goss/vars.yaml
+++ b/.vib/kafka/goss/vars.yaml
@@ -1,7 +1,6 @@
 binaries:
   - java
   - kafka-server-start.sh
-  - wait-for-port
 directories:
   - mode: "0775"
     paths: