diff --git a/charts/shipyard/templates/tests/test-airflow-api.yaml b/charts/shipyard/templates/tests/test-airflow-api.yaml
index d863d1e9..6d817514 100644
--- a/charts/shipyard/templates/tests/test-airflow-api.yaml
+++ b/charts/shipyard/templates/tests/test-airflow-api.yaml
@@ -11,11 +11,13 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License. */}}
+# limitations under the License.
+*/}}
 {{/*
 Test Airflow for api functionality.
 */}}
 {{- if .Values.manifests.test_airflow_api }}
+{{- $envAll := . }}
 ---
 apiVersion: v1
 kind: Pod
@@ -23,6 +25,8 @@ metadata:
   name: "{{ .Release.Name }}-airflow-api-test"
   annotations:
     "helm.sh/hook": "test-success"
+  labels:
+{{ tuple $envAll "airflow" "api-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   restartPolicy: Never
   containers:
diff --git a/charts/shipyard/templates/tests/test-shipyard-api.yaml b/charts/shipyard/templates/tests/test-shipyard-api.yaml
index b68d60c9..36f77e4f 100644
--- a/charts/shipyard/templates/tests/test-shipyard-api.yaml
+++ b/charts/shipyard/templates/tests/test-shipyard-api.yaml
@@ -11,11 +11,13 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License. */}}
+# limitations under the License.
+*/}}
 {{/*
 Test the Shipyard API, to ensure that the health endpoint is active and able to respond.
 */}}
 {{- if .Values.manifests.test_shipyard_api }}
+{{- $envAll := . }}
 ---
 apiVersion: v1
 kind: Pod
@@ -23,6 +25,8 @@ metadata:
   name: "{{ .Release.Name }}-shipyard-api-test"
   annotations:
     "helm.sh/hook": "test-success"
+  labels:
+{{ tuple $envAll "shipyard" "api-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   restartPolicy: Never
   containers: