diff --git a/elasticsearch/templates/pod-helm-tests.yaml b/elasticsearch/templates/pod-helm-tests.yaml
index b6bd74bb0..86179f1f5 100644
--- a/elasticsearch/templates/pod-helm-tests.yaml
+++ b/elasticsearch/templates/pod-helm-tests.yaml
@@ -22,6 +22,8 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: "{{.Release.Name}}-test"
+  labels:
+{{ tuple $envAll "elasticsearch" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     "helm.sh/hook": test-success
 spec:
diff --git a/fluent-logging/templates/pod-helm-tests.yaml b/fluent-logging/templates/pod-helm-tests.yaml
index 077ee2868..a004d9925 100644
--- a/fluent-logging/templates/pod-helm-tests.yaml
+++ b/fluent-logging/templates/pod-helm-tests.yaml
@@ -22,6 +22,8 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: "{{.Release.Name}}-test"
+  labels:
+{{ tuple $envAll "fluent-logging" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     "helm.sh/hook": test-success
 spec:
diff --git a/grafana/templates/pod-helm-tests.yaml b/grafana/templates/pod-helm-tests.yaml
index 13aaf500d..30971fe40 100644
--- a/grafana/templates/pod-helm-tests.yaml
+++ b/grafana/templates/pod-helm-tests.yaml
@@ -22,6 +22,8 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: "{{.Release.Name}}-test"
+  labels:
+{{ tuple $envAll "grafana" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     "helm.sh/hook": test-success
 spec:
diff --git a/prometheus/templates/pod-helm-tests.yaml b/prometheus/templates/pod-helm-tests.yaml
index 70f63ad89..a256760a2 100644
--- a/prometheus/templates/pod-helm-tests.yaml
+++ b/prometheus/templates/pod-helm-tests.yaml
@@ -21,6 +21,8 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: "{{.Release.Name}}-test"
+  labels:
+{{ tuple $envAll "prometheus" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     "helm.sh/hook": test-success
 spec: