diff --git a/ceilometer/templates/pod-rally-test.yaml b/ceilometer/templates/pod-rally-test.yaml
index 3a3fb99833..2aa9deafce 100644
--- a/ceilometer/templates/pod-rally-test.yaml
+++ b/ceilometer/templates/pod-rally-test.yaml
@@ -23,7 +23,7 @@ limitations under the License.
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{.Release.Name}}-rally-test"
+  name: "{{.Release.Name}}-test"
   annotations:
     "helm.sh/hook": test-success
 spec:
diff --git a/cinder/templates/pod-rally-test.yaml b/cinder/templates/pod-rally-test.yaml
index 60d52d6985..266ed73b8a 100644
--- a/cinder/templates/pod-rally-test.yaml
+++ b/cinder/templates/pod-rally-test.yaml
@@ -23,7 +23,7 @@ limitations under the License.
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{.Release.Name}}-rally-test"
+  name: "{{.Release.Name}}-test"
   annotations:
     "helm.sh/hook": test-success
 spec:
diff --git a/glance/templates/pod-rally-test.yaml b/glance/templates/pod-rally-test.yaml
index 04f68def3e..0675caab3a 100644
--- a/glance/templates/pod-rally-test.yaml
+++ b/glance/templates/pod-rally-test.yaml
@@ -23,7 +23,7 @@ limitations under the License.
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{.Release.Name}}-rally-test"
+  name: "{{.Release.Name}}-test"
   annotations:
     "helm.sh/hook": test-success
 spec:
diff --git a/gnocchi/templates/pod-gnocchi-test.yaml b/gnocchi/templates/pod-gnocchi-test.yaml
index a44f530c4c..adf6582706 100644
--- a/gnocchi/templates/pod-gnocchi-test.yaml
+++ b/gnocchi/templates/pod-gnocchi-test.yaml
@@ -23,7 +23,7 @@ limitations under the License.
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{.Release.Name}}-rally-test"
+  name: "{{.Release.Name}}-test"
   annotations:
     "helm.sh/hook": test-success
 spec:
diff --git a/keystone/templates/pod-rally-test.yaml b/keystone/templates/pod-rally-test.yaml
index 195633d1a8..9895b10c6f 100644
--- a/keystone/templates/pod-rally-test.yaml
+++ b/keystone/templates/pod-rally-test.yaml
@@ -23,7 +23,7 @@ limitations under the License.
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{.Release.Name}}-rally-test"
+  name: "{{.Release.Name}}-test"
   annotations:
     "helm.sh/hook": test-success
 spec:
diff --git a/neutron/templates/pod-rally-test.yaml b/neutron/templates/pod-rally-test.yaml
index 660c2c44b5..b7f5d49d15 100644
--- a/neutron/templates/pod-rally-test.yaml
+++ b/neutron/templates/pod-rally-test.yaml
@@ -23,7 +23,7 @@ limitations under the License.
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{.Release.Name}}-rally-test"
+  name: "{{.Release.Name}}-test"
   annotations:
     "helm.sh/hook": test-success
 spec:
diff --git a/nova/templates/pod-rally-test.yaml b/nova/templates/pod-rally-test.yaml
index ee24674423..c020471b75 100644
--- a/nova/templates/pod-rally-test.yaml
+++ b/nova/templates/pod-rally-test.yaml
@@ -23,7 +23,7 @@ limitations under the License.
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{.Release.Name}}-rally-test"
+  name: "{{.Release.Name}}-test"
   annotations:
     "helm.sh/hook": test-success
 spec:
diff --git a/tools/gate/funcs/helm.sh b/tools/gate/funcs/helm.sh
index 411b13c5ba..a30854d1e6 100755
--- a/tools/gate/funcs/helm.sh
+++ b/tools/gate/funcs/helm.sh
@@ -84,17 +84,14 @@ function helm_test_deployment {
     TIMEOUT=$2
   fi
 
-  NAME="${DEPLOYMENT}-rally-test"
-  if [ "$#" -gt 2 ]; then
-    NAME="${DEPLOYMENT}-test"
-  fi
+  NAME="${DEPLOYMENT}-test"
 
   # Get the namespace of the chart via the Helm release
   NAMESPACE=$(helm status ${DEPLOYMENT} |  awk '/^NAMESPACE/ { print $NF }')
 
   helm test --timeout ${TIMEOUT} ${DEPLOYMENT}
-  mkdir -p ${LOGS_DIR}/rally
-  kubectl logs -n ${NAMESPACE} ${NAME} > ${LOGS_DIR}/rally/${DEPLOYMENT}
+  mkdir -p ${LOGS_DIR}/helm-tests
+  kubectl logs -n ${NAMESPACE} ${NAME} > ${LOGS_DIR}/helm-tests/${DEPLOYMENT}
   kubectl delete -n ${NAMESPACE} pod ${NAME}
 }
 
diff --git a/tools/gate/launch-osh/basic.sh b/tools/gate/launch-osh/basic.sh
index 7e6c469f80..a7577f67cf 100755
--- a/tools/gate/launch-osh/basic.sh
+++ b/tools/gate/launch-osh/basic.sh
@@ -217,7 +217,7 @@ if [ "x$INTEGRATION" == "xmulti" ]; then
   helm_test_deployment cinder ${SERVICE_TEST_TIMEOUT}
   helm_test_deployment neutron ${SERVICE_TEST_TIMEOUT}
   helm_test_deployment nova ${SERVICE_TEST_TIMEOUT}
-  helm_test_deployment barbican ${SERVICE_TEST_TIMEOUT} norally
+  helm_test_deployment barbican ${SERVICE_TEST_TIMEOUT}
 fi
 
 if [ "x$RALLY_CHART_ENABLED" == "xtrue" ]; then