diff --git a/tools/deployment/multinode/080-keystone.sh b/tools/deployment/multinode/080-keystone.sh
index a1177d79f9..b4d8396d06 100755
--- a/tools/deployment/multinode/080-keystone.sh
+++ b/tools/deployment/multinode/080-keystone.sh
@@ -31,4 +31,6 @@ helm status keystone
 export OS_CLOUD=openstack_helm
 sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx
 openstack endpoint list
+# Delete the test pod if it still exists
+kubectl delete pods -l application=keystone,release_group=keystone,component=test --namespace=openstack --ignore-not-found
 helm test keystone --timeout 900
diff --git a/tools/deployment/multinode/100-glance.sh b/tools/deployment/multinode/100-glance.sh
index 4c291dccb4..8c9c10995e 100755
--- a/tools/deployment/multinode/100-glance.sh
+++ b/tools/deployment/multinode/100-glance.sh
@@ -58,4 +58,6 @@ openstack service list
 sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx
 openstack image list
 openstack image show 'Cirros 0.3.5 64-bit'
+# Delete the test pod if it still exists
+kubectl delete pods -l application=glance,release_group=glance,component=test --namespace=openstack --ignore-not-found
 helm test glance --timeout 900
diff --git a/tools/deployment/multinode/110-cinder.sh b/tools/deployment/multinode/110-cinder.sh
index e262cae973..2f03e26939 100755
--- a/tools/deployment/multinode/110-cinder.sh
+++ b/tools/deployment/multinode/110-cinder.sh
@@ -42,4 +42,6 @@ export OS_CLOUD=openstack_helm
 openstack service list
 sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx
 openstack volume type list
+# 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
diff --git a/tools/deployment/multinode/140-compute-kit.sh b/tools/deployment/multinode/140-compute-kit.sh
index b329dbf6d7..b095941c1e 100755
--- a/tools/deployment/multinode/140-compute-kit.sh
+++ b/tools/deployment/multinode/140-compute-kit.sh
@@ -103,5 +103,8 @@ openstack service list
 sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx
 openstack compute service list
 openstack network agent list
+# Delete the test pods if they still exist
+kubectl delete pods -l application=nova,release_group=nova,component=test --namespace=openstack --ignore-not-found
+kubectl delete pods -l application=neutron,release_group=neutron,component=test --namespace=openstack --ignore-not-found
 helm test nova --timeout 900
 helm test neutron --timeout 900
diff --git a/tools/deployment/multinode/150-heat.sh b/tools/deployment/multinode/150-heat.sh
index f395ae099c..d9eb06bdb4 100755
--- a/tools/deployment/multinode/150-heat.sh
+++ b/tools/deployment/multinode/150-heat.sh
@@ -38,4 +38,6 @@ export OS_CLOUD=openstack_helm
 openstack service list
 sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx
 openstack orchestration service list
+# Delete the test pod if it still exists
+kubectl delete pods -l application=heat,release_group=heat,component=test --namespace=openstack --ignore-not-found
 helm test heat --timeout 900
diff --git a/tools/deployment/multinode/160-barbican.sh b/tools/deployment/multinode/160-barbican.sh
index 3cc1d778af..dabeda2674 100755
--- a/tools/deployment/multinode/160-barbican.sh
+++ b/tools/deployment/multinode/160-barbican.sh
@@ -29,4 +29,6 @@ helm upgrade --install barbican ./barbican \
 export OS_CLOUD=openstack_helm
 openstack service list
 sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx
+# 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/multinode/180-mistral.sh b/tools/deployment/multinode/180-mistral.sh
index 2603b61fcc..0de5d14189 100755
--- a/tools/deployment/multinode/180-mistral.sh
+++ b/tools/deployment/multinode/180-mistral.sh
@@ -31,4 +31,6 @@ helm upgrade --install mistral ./mistral \
 #NOTE: Validate Deployment
 export OS_CLOUD=openstack_helm
 openstack service list
+# Delete the test pod if it still exists
+kubectl delete pods -l application=mistral,release_group=mistral,component=test --namespace=openstack --ignore-not-found
 helm test mistral