diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f2717a2a3..2a7f9dc0f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,6 +11,7 @@ jobs:
     strategy:
       matrix:
         chart:
+          - accountapp
           - artifact-caching-proxy
           - httpredirector
           - jenkins-jobs
diff --git a/charts/accountapp/Chart.yaml b/charts/accountapp/Chart.yaml
index 9af89ed72..8ae091fdf 100644
--- a/charts/accountapp/Chart.yaml
+++ b/charts/accountapp/Chart.yaml
@@ -3,4 +3,4 @@ description: A Helm chart for accounts.jenkins.io
 maintainers:
 - name: timja
 name: accountapp
-version: 0.5.26
+version: 0.6.0
diff --git a/charts/accountapp/templates/tests/test-connection.yaml b/charts/accountapp/templates/tests/test-connection.yaml
deleted file mode 100644
index 9b01d42fc..000000000
--- a/charts/accountapp/templates/tests/test-connection.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "accountapp.fullname" . }}-test-connection"
-  labels:
-{{ include "accountapp.labels" . | indent 4 }}
-  annotations:
-    "helm.sh/hook": test-success
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args:  ['{{ include "accountapp.fullname" . }}:8080/login']
-  restartPolicy: Never
diff --git a/charts/accountapp/tests/defaults_test.yaml b/charts/accountapp/tests/defaults_test.yaml
new file mode 100644
index 000000000..d00703954
--- /dev/null
+++ b/charts/accountapp/tests/defaults_test.yaml
@@ -0,0 +1,24 @@
+suite: default tests
+values:
+  - ../values.yaml
+  - secrets_default_values.yaml
+templates:
+  - deployment.yaml
+  - ingress.yaml
+  - secret.yaml # Direct dependency of deployment.yaml
+tests:
+  - it: should create an ingress by default
+    template: ingress.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+  - it: should define the default deployment with default imagePullPolicy
+    template: deployment.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: Deployment
+      - equal:
+          path: spec.template.spec.containers[0].imagePullPolicy
+          value: IfNotPresent
diff --git a/charts/accountapp/tests/secrets_default_values.yaml b/charts/accountapp/tests/secrets_default_values.yaml
new file mode 100644
index 000000000..10b88a489
--- /dev/null
+++ b/charts/accountapp/tests/secrets_default_values.yaml
@@ -0,0 +1,6 @@
+ldap:
+  password: ldap-password
+jira:
+  password: jira-password
+smtp:
+  password: smtp-password
diff --git a/charts/accountapp/values.yaml b/charts/accountapp/values.yaml
index 24c3f8552..32b55fcf5 100644
--- a/charts/accountapp/values.yaml
+++ b/charts/accountapp/values.yaml
@@ -5,6 +5,7 @@ replicaCount: 1
 image:
   repository: jenkinsciinfra/account-app
   tag: 0.4.29
+  pullPolicy: IfNotPresent
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""