diff --git a/tools/deployment/multinode/110-cinder.sh b/tools/deployment/multinode/110-cinder.sh
index 55f3af0a..d5e74c60 100755
--- a/tools/deployment/multinode/110-cinder.sh
+++ b/tools/deployment/multinode/110-cinder.sh
@@ -15,6 +15,7 @@ set -xe
 
 #NOTE: Get the over-rides to use
 : ${OSH_EXTRA_HELM_ARGS_CINDER:="$(./tools/deployment/common/get-values-overrides.sh cinder)"}
+: ${RUN_HELM_TESTS:="yes"}
 
 #NOTE: Lint and package chart
 make cinder
@@ -79,6 +80,7 @@ sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and rest
 openstack volume type list
 openstack volume type list --default
 
-# Delete the test pod if it still exists
-kubectl delete pods -l application=cinder,release_group=cinder,component=test --namespace=openstack --ignore-not-found
-helm test cinder --timeout 900
+# Run helm tests
+if [ "x${RUN_HELM_TESTS}" != "xno" ]; then
+    ./tools/deployment/common/run-helm-tests.sh cinder
+fi