diff --git a/library/common-test/tests/cnpg/credentials_test.yaml b/library/common-test/tests/cnpg/credentials_test.yaml
index 8262d9d0..86317c55 100644
--- a/library/common-test/tests/cnpg/credentials_test.yaml
+++ b/library/common-test/tests/cnpg/credentials_test.yaml
@@ -46,6 +46,43 @@ tests:
         equal:
           path: metadata.name
           value: test-release-name-common-test-cnpg-my-pg-urls
+      - documentIndex: *secretDoc
+        isSubset:
+          path: stringData
+          content:
+            porthost: test-release-name-common-test-cnpg-my-pg-rw:5432
+            host: test-release-name-common-test-cnpg-my-pg-rw
+            jdbc: jdbc:postgresql://test-release-name-common-test-cnpg-my-pg-rw:5432/test-db
+      - documentIndex: *secretDoc
+        matchRegex:
+          path: stringData.std
+          pattern: postgresql://test-user:[a-zA-Z0-9]{62}@test-release-name-common-test-cnpg-my-pg-rw:5432/test-db
+      - documentIndex: *secretDoc
+        matchRegex:
+          path: stringData.nossl
+          pattern: postgresql://test-user:[a-zA-Z0-9]{62}@test-release-name-common-test-cnpg-my-pg-rw:5432/test-db\?sslmode=disable
+
+  - it: should generate correct secret with pooler
+    set:
+      cnpg:
+        my-pg:
+          enabled: true
+          user: test-user
+          database: test-db
+          pooler:
+            enabled: true
+            createRO: false
+    asserts:
+      - documentIndex: &secretDoc 4
+        isKind:
+          of: Secret
+      - documentIndex: *secretDoc
+        isAPIVersion:
+          of: v1
+      - documentIndex: *secretDoc
+        equal:
+          path: metadata.name
+          value: test-release-name-common-test-cnpg-my-pg-urls
       - documentIndex: *secretDoc
         isSubset:
           path: stringData
@@ -70,6 +107,7 @@ tests:
           user: test-user
           database: test-db
           pooler:
+            enabled: true
             createRO: true
     asserts:
       - documentIndex: &secretDoc 4