diff --git a/tools/deployment/developer/common/085-barbican.sh b/tools/deployment/developer/common/085-barbican.sh
index 212d3369f0..e84acff7e2 100755
--- a/tools/deployment/developer/common/085-barbican.sh
+++ b/tools/deployment/developer/common/085-barbican.sh
@@ -32,4 +32,6 @@ helm upgrade --install barbican ./barbican \
 #NOTE: Validate Deployment info
 helm status barbican
 
+# Delete the test pod if it still exists
+kubectl delete pods -l application=barbican,release_group=barbican,component=test --namespace=openstack --ignore-not-found
 helm test barbican
diff --git a/tools/deployment/developer/common/100-horizon.sh b/tools/deployment/developer/common/100-horizon.sh
index d3646566eb..fa7d16539f 100755
--- a/tools/deployment/developer/common/100-horizon.sh
+++ b/tools/deployment/developer/common/100-horizon.sh
@@ -35,4 +35,6 @@ helm upgrade --install horizon ./horizon \
 #NOTE: Validate Deployment info
 helm status horizon
 
+# Delete the test pod if it still exists
+kubectl delete pods -l application=horizon,release_group=horizon,component=test --namespace=openstack --ignore-not-found
 helm test horizon
diff --git a/tools/deployment/multinode/090-ceph-radosgateway.sh b/tools/deployment/multinode/090-ceph-radosgateway.sh
index 52543d3aa7..51a15f4a58 100755
--- a/tools/deployment/multinode/090-ceph-radosgateway.sh
+++ b/tools/deployment/multinode/090-ceph-radosgateway.sh
@@ -80,4 +80,6 @@ helm status radosgw-openstack
 
 #NOTE: Run Tests
 export OS_CLOUD=openstack_helm
+# Delete the test pod if it still exists
+kubectl delete pods -l application=radosgw-openstack,release_group=radosgw-openstack,component=test --namespace=openstack --ignore-not-found
 helm test radosgw-openstack