diff --git a/charts/openfga/templates/tests/test-connection.yaml b/charts/openfga/templates/tests/test-connection.yaml
index 59d06411..ce1a65da 100644
--- a/charts/openfga/templates/tests/test-connection.yaml
+++ b/charts/openfga/templates/tests/test-connection.yaml
@@ -16,4 +16,10 @@ spec:
       image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
       imagePullPolicy: {{ .Values.image.pullPolicy }}
       command: ["grpc_health_probe", '-addr={{ include "openfga.fullname" . }}:{{ (split ":" .Values.grpc.addr)._1 }}']
+      {{- with .Values.testContainerSpec }}
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
   restartPolicy: Never
+  {{- with .Values.testPodSpec }}
+    {{- toYaml . | nindent 2 }}
+  {{- end }}
diff --git a/charts/openfga/values.schema.json b/charts/openfga/values.schema.json
index 7619a4ae..59f29e6e 100644
--- a/charts/openfga/values.schema.json
+++ b/charts/openfga/values.schema.json
@@ -1042,6 +1042,14 @@
                 }
             }
         },
+        "testPodSpec": {
+            "type": "object",
+            "description": "Extra spec for the test pod to match cluster policy"
+        },
+        "testContainerSpec": {
+            "type": "object",
+            "description": "Extra spec for the test container to match cluster policy"
+        },
         "common": {},
         "extraObjects": {
             "type": "array",
diff --git a/charts/openfga/values.yaml b/charts/openfga/values.yaml
index afbad2cb..53719b4e 100644
--- a/charts/openfga/values.yaml
+++ b/charts/openfga/values.yaml
@@ -342,6 +342,9 @@ migrate:
   labels: {}
   timeout:
 
+testPodSpec: {}
+testContainerSpec: {}
+
 # -- Array of extra K8s manifests to deploy
 ## Note: Supports use of custom Helm templates
 extraObjects: []