diff --git a/templates/tests/test-runner.yaml b/templates/tests/test-runner.yaml
index bc836606b1..b8b078003b 100644
--- a/templates/tests/test-runner.yaml
+++ b/templates/tests/test-runner.yaml
@@ -67,10 +67,12 @@ spec:
         - "/bin/sh"
         - "-ec"
         - |
-            export VALUE="{{ .Release.Name }}"
-            consul kv delete _consul_helm_test
-            consul kv put _consul_helm_test $VALUE
-            [ `consul kv get _consul_helm_test` = "$VALUE" ]
-            consul kv delete _consul_helm_test
+            consul members | tee members.txt
+            if [ $(grep -c consul-server members.txt) != $(grep consul-server members.txt | grep -c alive) ]
+            then
+              echo "Failed because not all consul servers are available"
+              exit 1
+            fi
+
   restartPolicy: Never
 {{- end }}