diff --git a/acceptance_tests/kubernetes_versions.robot b/acceptance_tests/kubernetes_versions.robot
index c66006c86..67b635dc3 100644
--- a/acceptance_tests/kubernetes_versions.robot
+++ b/acceptance_tests/kubernetes_versions.robot
@@ -88,6 +88,9 @@ Verify --wait flag works as expected
     Kubectl.Get services    default
     Kubectl.Get persistent volume claims    default
 
+    Kubectl.Persistent volume claim is bound    default    wait-flag-bad-nginx
+    Kubectl.Return code should not be   0
+
     Kubectl.Pods with prefix are running    default    wait-flag-bad-nginx-ext-    3
     Kubectl.Return code should not be   0
     Kubectl.Pods with prefix are running    default    wait-flag-bad-nginx-fluentd-es-    1
diff --git a/acceptance_tests/testdata/charts/nginx/templates/deployment.yaml b/acceptance_tests/testdata/charts/nginx/templates/deployment.yaml
index b77d92d7a..19923101e 100755
--- a/acceptance_tests/testdata/charts/nginx/templates/deployment.yaml
+++ b/acceptance_tests/testdata/charts/nginx/templates/deployment.yaml
@@ -73,7 +73,6 @@ spec:
               command:
               - sh
               - "-c"
-
               - "echo bar | grep {{ if .Values.breakme }}foo{{ else }}bar{{ end }}"
 
 ---
diff --git a/acceptance_tests/testdata/charts/nginx/templates/pvc.yaml b/acceptance_tests/testdata/charts/nginx/templates/pvc.yaml
index 193d7a830..37a58ed77 100755
--- a/acceptance_tests/testdata/charts/nginx/templates/pvc.yaml
+++ b/acceptance_tests/testdata/charts/nginx/templates/pvc.yaml
@@ -10,4 +10,4 @@ spec:
     requests:
       storage: 8Gi
   # Change this to a non-existent name to force it to never provision
-  storageClassName: standard
+  storageClassName: "{{ if .Values.breakme }}nonexistant{{ else }}standard{{ end }}"