diff --git a/src/test/helm/xta_keystore_secret_test.yaml b/src/test/helm/xta_keystore_secret_test.yaml
index cc1e9b2a8032d85248cf57a08db8bb57ef8aedf6..77c84e8f99c541647f705bf5aa1f49ed94f1e699 100644
--- a/src/test/helm/xta_keystore_secret_test.yaml
+++ b/src/test/helm/xta_keystore_secret_test.yaml
@@ -29,7 +29,7 @@ release:
   name: xta-adapter
   namespace: helm-test
 tests:
-  - it: should create keystore with values
+  - it: should create keystore secret
     set:
       ozgcloud:
         xta:
@@ -40,23 +40,68 @@ tests:
     asserts:
       - isKind:
           of: Secret
+  - it: should set api version
+    set:
+      ozgcloud:
+        xta:
+          keystore:
+            password: geheim
+            type: pkcs12
+            file: Z2VoZWltCg==
+    asserts:
       - isAPIVersion:
           of: v1
+  - it: should set value type
+    set:
+      ozgcloud:
+        xta:
+          keystore:
+            password: geheim
+            type: pkcs12
+            file: Z2VoZWltCg==
+    asserts:
       - equal:
           path: type
           value: Opaque
+  - it: should set metadate values
+    set:
+      ozgcloud:
+        xta:
+          keystore:
+            password: geheim
+            type: pkcs12
+            file: Z2VoZWltCg==
+    asserts:
       - equal:
           path: metadata.name
           value: xta-keystore
       - equal:
           path: metadata.namespace
           value: helm-test
+  - it: should set springData values
+    set:
+      ozgcloud:
+        xta:
+          keystore:
+            password: geheim
+            type: pkcs12
+            file: Z2VoZWltCg==
+    asserts:
       - equal:
           path: stringData.password
           value: geheim
       - equal:
           path: stringData.type
           value: pkcs12
+  - it: should set value for data.file
+    set:
+      ozgcloud:
+        xta:
+          keystore:
+            password: geheim
+            type: pkcs12
+            file: Z2VoZWltCg==
+    asserts:
       - equal:
           path: data.file
           value: Z2VoZWltCg==
diff --git a/src/test/helm/xta_truststore_secret_test.yaml b/src/test/helm/xta_truststore_secret_test.yaml
index ba28a2c4640338159ffc39b94654cca2ef0b7951..76dba6cf75560bca814ec9dc21fc750499264d9b 100644
--- a/src/test/helm/xta_truststore_secret_test.yaml
+++ b/src/test/helm/xta_truststore_secret_test.yaml
@@ -29,7 +29,7 @@ release:
   name: xta-adapter
   namespace: helm-test
 tests:
-  - it: should create truststore with values
+  - it: should create truststore secret
     set:
       ozgcloud:
         xta:
@@ -40,23 +40,68 @@ tests:
     asserts:
       - isKind:
           of: Secret
+  - it: should set api version
+    set:
+      ozgcloud:
+        xta:
+          truststore:
+            password: geheim
+            type: JKS
+            file: Z2VoZWltCg==
+    asserts:
       - isAPIVersion:
           of: v1
+  - it: should set value for type
+    set:
+      ozgcloud:
+        xta:
+          truststore:
+            password: geheim
+            type: JKS
+            file: Z2VoZWltCg==
+    asserts:
       - equal:
           path: type
           value: Opaque
+  - it: should set values for metadata
+    set:
+      ozgcloud:
+        xta:
+          truststore:
+            password: geheim
+            type: JKS
+            file: Z2VoZWltCg==
+    asserts:
       - equal:
           path: metadata.name
           value: xta-truststore
       - equal:
           path: metadata.namespace
           value: helm-test
+  - it: should set stringData values
+    set:
+      ozgcloud:
+        xta:
+          truststore:
+            password: geheim
+            type: JKS
+            file: Z2VoZWltCg==
+    asserts:
       - equal:
           path: stringData.password
           value: geheim
       - equal:
           path: stringData.type
           value: JKS
+  - it: should set value data.file
+    set:
+      ozgcloud:
+        xta:
+          truststore:
+            password: geheim
+            type: JKS
+            file: Z2VoZWltCg==
+    asserts:
       - equal:
           path: data.file
           value: Z2VoZWltCg==