diff --git a/tests/util/helpers.sh b/tests/util/helpers.sh
index 5c7ccb569d..e0c7fc6ee4 100644
--- a/tests/util/helpers.sh
+++ b/tests/util/helpers.sh
@@ -114,7 +114,7 @@ _wait_for_gateway() {
     local namespace="$1"
     local name="$2"
     local context="${3:-}"
-    if ! kubectl --context="$context" -n "$namespace" wait --for=condition=ready gtw "$name" --timeout=2m; then
+    if ! kubectl --context="$context" -n "$namespace" wait --for=condition=programmed gtw "$name" --timeout=2m; then
         echo "Failed to deploy gateway $name in namespace $namespace"
         exit 1
     fi
diff --git a/tests/util/samples.sh b/tests/util/samples.sh
index 24e01431a6..6d19b269b7 100644
--- a/tests/util/samples.sh
+++ b/tests/util/samples.sh
@@ -22,7 +22,7 @@ startup_bookinfo_sample() {
 
     if [ "$GATEWAY_API" == "true" ]; then
         kubectl apply -f samples/bookinfo/gateway-api/bookinfo-gateway.yaml
-        kubectl wait --for=condition=ready gtw bookinfo-gateway --timeout=2m
+        kubectl wait --for=condition=programmed gtw bookinfo-gateway --timeout=2m
         kubectl apply -f samples/bookinfo/platform/kube/bookinfo-versions.yaml
     else
         kubectl apply -f samples/bookinfo/networking/bookinfo-gateway.yaml