diff --git a/charts/shipyard/templates/tests/test-shipyard-api.yaml b/charts/shipyard/templates/tests/test-shipyard-api.yaml
index 77704041..8c93e207 100644
--- a/charts/shipyard/templates/tests/test-shipyard-api.yaml
+++ b/charts/shipyard/templates/tests/test-shipyard-api.yaml
@@ -30,6 +30,8 @@ metadata:
 {{ tuple $envAll "shipyard" "api-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   restartPolicy: Never
+  nodeSelector:
+    {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }}
   containers:
     - name: "{{ .Release.Name }}-shipyard-api-test"
       env:
diff --git a/charts/shipyard/values.yaml b/charts/shipyard/values.yaml
index 058cf7c0..67d248cd 100644
--- a/charts/shipyard/values.yaml
+++ b/charts/shipyard/values.yaml
@@ -25,6 +25,9 @@ labels:
   airflow:
     node_selector_key: ucp-control-plane
     node_selector_value: enabled
+  test:
+    node_selector_key: ucp-control-plane
+    node_selector_value: enabled
 
 images:
   tags: