diff --git a/charts/sourcegraph/templates/tests/test-connection.yaml b/charts/sourcegraph/templates/tests/test-connection.yaml
index 8bf16f39..250641bd 100644
--- a/charts/sourcegraph/templates/tests/test-connection.yaml
+++ b/charts/sourcegraph/templates/tests/test-connection.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.sgTestConnection.enabled -}}
 apiVersion: v1
 kind: Pod
 metadata:
@@ -9,7 +10,8 @@ metadata:
 spec:
   containers:
     - name: wget
-      image: busybox
+      image: {{ include "sourcegraph.image" (list . "sgTestConnection") }}
       command: ['wget']
       args: ['sourcegraph-frontend:30080/']
-  restartPolicy: Never
\ No newline at end of file
+  restartPolicy: Never
+{{- end }}
diff --git a/charts/sourcegraph/values.yaml b/charts/sourcegraph/values.yaml
index 21689827..4d76e04c 100644
--- a/charts/sourcegraph/values.yaml
+++ b/charts/sourcegraph/values.yaml
@@ -1084,6 +1084,16 @@ searcher:
   # -- Size of the PVC for searcher pods to store cache data
   storageSize: 26Gi
 
+sgTestConnection:
+  # Run a connection test after instance startup, for CI/CD testing
+  # Setting to true to not change default behaviour
+  enabled: true
+  image:
+    # -- Docker image tag for the sg-test-connection pod
+    defaultTag: ''
+    # -- Docker image name for the sg-test-connection pod
+    name: "busybox"
+
 storageClass:
   # -- Enable creation of storageClass.
   # Disable if you have your own existing storage class