diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java
index 55e39c70..e9d3dceb 100644
--- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java
+++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java
@@ -41,6 +41,7 @@ import io.kubernetes.client.openapi.models.V1ClusterRole;
 import io.kubernetes.client.openapi.models.V1ClusterRoleBinding;
 import io.kubernetes.client.openapi.models.V1ConfigMap;
 import io.kubernetes.client.openapi.models.V1Deployment;
+import io.kubernetes.client.openapi.models.V1DeploymentCondition;
 import io.kubernetes.client.openapi.models.V1DeploymentList;
 import io.kubernetes.client.openapi.models.V1Ingress;
 import io.kubernetes.client.openapi.models.V1LoadBalancerIngress;
@@ -625,10 +626,27 @@ public final class Util {
 			fail("No deployments with the name " + deploymentName);
 		}
 		V1Deployment deployment = deployments.getItems().get(0);
-		Integer availableReplicas = deployment.getStatus().getAvailableReplicas();
-		LOG.info("Available replicas for " + deploymentName + ": "
-				+ (availableReplicas == null ? 0 : availableReplicas));
-		return availableReplicas != null && availableReplicas >= 1;
+		if (deployment.getStatus() != null) {
+			Integer availableReplicas = deployment.getStatus().getAvailableReplicas();
+			logDeploymentConditions(deployment.getStatus().getConditions());
+			LOG.info("Available replicas for " + deploymentName + ": "
+					+ (availableReplicas == null ? 0 : availableReplicas));
+			return availableReplicas != null && availableReplicas >= 1;
+		}
+		else {
+			return false;
+		}
+	}
+
+	private void logDeploymentConditions(List<V1DeploymentCondition> conditions) {
+		if (conditions != null) {
+			for (V1DeploymentCondition condition : conditions) {
+				LOG.info("Deployment Condition Type: " + condition.getType());
+				LOG.info("Deployment Condition Status: " + condition.getStatus());
+				LOG.info("Deployment Condition Message: " + condition.getMessage());
+				LOG.info("Deployment Condition Reason: " + condition.getReason());
+			}
+		}
 	}
 
 	private static void waitForDeploymentAfterPatch(String deploymentName, String namespace,
diff --git a/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-deployment.yaml b/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-deployment.yaml
index cbe261d3..f0870b68 100644
--- a/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-deployment.yaml
+++ b/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-deployment.yaml
@@ -25,14 +25,14 @@ spec:
         - name: kafka-start-config-script
           configMap:
               name: kafka-start-config-script
-              defaultMode: 0744
+              defaultMode: 0755
       containers:
         - name: kafka-start-config-script
           volumeMounts:
             - name: kafka-start-config-script
               mountPath: /tmp
           command:
-            - /tmp/./kafka_start.sh
+            - /tmp/kafka_start.sh
           image: confluentinc/cp-kafka:7.2.1
           ports:
             - containerPort: 9092