diff --git a/charts/accountapp/Chart.yaml b/charts/accountapp/Chart.yaml
index cee51587c..fb98fb0e3 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.6.13
+version: 0.6.14
diff --git a/charts/accountapp/tests/custom_values_test.yaml b/charts/accountapp/tests/custom_values_test.yaml
new file mode 100644
index 000000000..490e44b41
--- /dev/null
+++ b/charts/accountapp/tests/custom_values_test.yaml
@@ -0,0 +1,29 @@
+suite: Test with custom values
+templates:
+  - deployment.yaml
+  - ingress.yaml
+  - secret.yaml # Direct dependency of deployment.yaml
+tests:
+  - it: should create a Secret with the correct value
+    set:
+      ldap:
+        password: ldap-password
+      jira:
+        password: jira-password
+      smtp:
+        password: smtp-password
+    template: secret.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: Secret
+      - equal:
+          path: data.ldapPassword
+          value: bGRhcC1wYXNzd29yZA==
+      - equal:
+          path: data.jiraPassword
+          value: amlyYS1wYXNzd29yZA==
+      - equal:
+          path: data.smtpPassword
+          value: c210cC1wYXNzd29yZA==
diff --git a/charts/accountapp/tests/defaults_test.yaml b/charts/accountapp/tests/defaults_test.yaml
index d00703954..c48acabd8 100644
--- a/charts/accountapp/tests/defaults_test.yaml
+++ b/charts/accountapp/tests/defaults_test.yaml
@@ -1,7 +1,4 @@
 suite: default tests
-values:
-  - ../values.yaml
-  - secrets_default_values.yaml
 templates:
   - deployment.yaml
   - ingress.yaml
diff --git a/charts/accountapp/tests/secrets_default_values.yaml b/charts/accountapp/tests/secrets_default_values.yaml
deleted file mode 100644
index 10b88a489..000000000
--- a/charts/accountapp/tests/secrets_default_values.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-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 b52adfbf9..c2f260b76 100644
--- a/charts/accountapp/values.yaml
+++ b/charts/accountapp/values.yaml
@@ -46,10 +46,10 @@ ldap:
   url: ldaps://ldap.jenkins.io:636/
   managerDn: cn=admin,dc=jenkins-ci,dc=org
   newUserBaseDn: ou=people,dc=jenkins-ci,dc=org
-  password: null
+  password: ""
 jira:
   username: accountapp
-  password: null
+  password: ""
   url: https://issues.jenkins.io/
 seats: 2
 seniority: 12
@@ -59,7 +59,7 @@ smtp:
   sender: admin@jenkins-ci.org
   port: 587
   user: null
-  password: null
+  password: ""
 appUrl: https://accounts.jenkins.io
 election:
   open: 1970-01-01