diff --git a/ceph-client/templates/pod-helm-tests.yaml b/ceph-client/templates/pod-helm-tests.yaml
index 05999bd5a..bded3419b 100644
--- a/ceph-client/templates/pod-helm-tests.yaml
+++ b/ceph-client/templates/pod-helm-tests.yaml
@@ -31,6 +31,8 @@ spec:
 {{ dict "envAll" $envAll "application" "test" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 2 }}
   restartPolicy: Never
   serviceAccountName: {{ $serviceAccountName }}
+  nodeSelector:
+    {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }}
   initContainers:
 {{ tuple $envAll "tests" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
   containers:
diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml
index 9771c76fb..5fa18b7e7 100644
--- a/ceph-client/values.yaml
+++ b/ceph-client/values.yaml
@@ -42,6 +42,9 @@ labels:
   job:
     node_selector_key: openstack-control-plane
     node_selector_value: enabled
+  test:
+    node_selector_key: openstack-control-plane
+    node_selector_value: enabled
   mds:
     node_selector_key: ceph-mds
     node_selector_value: enabled
diff --git a/ceph-osd/templates/pod-helm-tests.yaml b/ceph-osd/templates/pod-helm-tests.yaml
index 3a41403e1..3d1740a84 100644
--- a/ceph-osd/templates/pod-helm-tests.yaml
+++ b/ceph-osd/templates/pod-helm-tests.yaml
@@ -32,6 +32,8 @@ spec:
 {{ dict "envAll" $envAll "application" "test" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 2 }}
   restartPolicy: Never
   serviceAccountName: {{ $serviceAccountName }}
+  nodeSelector:
+    {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }}
   initContainers:
 {{ tuple $envAll "tests" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
   containers:
diff --git a/ceph-osd/values.yaml b/ceph-osd/values.yaml
index 520c246e4..98dd765c5 100644
--- a/ceph-osd/values.yaml
+++ b/ceph-osd/values.yaml
@@ -35,6 +35,9 @@ labels:
   job:
     node_selector_key: openstack-control-plane
     node_selector_value: enabled
+  test:
+    node_selector_key: openstack-control-plane
+    node_selector_value: enabled
   osd:
     node_selector_key: ceph-osd
     node_selector_value: enabled
diff --git a/ceph-provisioners/templates/pod-helm-tests.yaml b/ceph-provisioners/templates/pod-helm-tests.yaml
index 7cb9f1270..bd428f8cd 100644
--- a/ceph-provisioners/templates/pod-helm-tests.yaml
+++ b/ceph-provisioners/templates/pod-helm-tests.yaml
@@ -71,6 +71,8 @@ spec:
 {{ dict "envAll" $envAll "application" "test" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 2 }}
   restartPolicy: Never
   serviceAccountName: {{ $serviceAccountName }}
+  nodeSelector:
+    {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }}
   initContainers:
 {{ tuple $envAll "tests" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
   containers:
diff --git a/ceph-provisioners/values.yaml b/ceph-provisioners/values.yaml
index 783fbecff..c401d2c0c 100644
--- a/ceph-provisioners/values.yaml
+++ b/ceph-provisioners/values.yaml
@@ -44,6 +44,9 @@ labels:
   job:
     node_selector_key: openstack-control-plane
     node_selector_value: enabled
+  test:
+    node_selector_key: openstack-control-plane
+    node_selector_value: enabled
   provisioner:
     node_selector_key: openstack-control-plane
     node_selector_value: enabled
diff --git a/ceph-rgw/templates/pod-helm-tests.yaml b/ceph-rgw/templates/pod-helm-tests.yaml
index 6a996311b..768d2c4d0 100644
--- a/ceph-rgw/templates/pod-helm-tests.yaml
+++ b/ceph-rgw/templates/pod-helm-tests.yaml
@@ -31,6 +31,8 @@ metadata:
 spec:
   restartPolicy: Never
   serviceAccountName: {{ $serviceAccountName }}
+  nodeSelector:
+    {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }}
   containers:
 {{ if .Values.conf.rgw_ks.enabled }}
     - name: ceph-rgw-ks-validation
diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml
index ea252d0a5..9c8c99e2d 100644
--- a/ceph-rgw/values.yaml
+++ b/ceph-rgw/values.yaml
@@ -43,6 +43,9 @@ labels:
   job:
     node_selector_key: openstack-control-plane
     node_selector_value: enabled
+  test:
+    node_selector_key: openstack-control-plane
+    node_selector_value: enabled
   rgw:
     node_selector_key: ceph-rgw
     node_selector_value: enabled