diff --git a/library/common-test/tests/cnpg/backup_metadata_test.yaml b/library/common-test/tests/cnpg/backup_metadata_test.yaml
index 71d0c5d3..c4873a16 100644
--- a/library/common-test/tests/cnpg/backup_metadata_test.yaml
+++ b/library/common-test/tests/cnpg/backup_metadata_test.yaml
@@ -10,9 +10,13 @@ tests:
   - it: should pass with cnpg manualBackups backup created with labels and annotations
     set:
       credentials:
-        test:
-          type: azure
-          connectionString: some-connection-string
+        test: &test
+          type: s3
+          url: some-url
+          bucket: some-bucket
+          encrKey: some-encr-key
+          accessKey: some-access-key
+          secretKey: some-secret-key
       label1: label1
       label2: global_label2
       label3: label3
@@ -107,11 +111,7 @@ tests:
   - it: should pass with cnpg manualBackups backup created with namespace
     set:
       credentials:
-        test:
-          type: s3
-          url: some-url
-          secretKey: some-secret-key
-          accessKey: some-access-key
+        test: *test
       cnpg:
         my-pg:
           enabled: true
@@ -136,11 +136,7 @@ tests:
   - it: should pass with cnpg manualBackups backup created with object namespace from tpl
     set:
       credentials:
-        test:
-          type: s3
-          url: some-url
-          secretKey: some-secret-key
-          accessKey: some-access-key
+        test: *test
       key: some-namespace
       cnpg:
         my-pg:
@@ -166,11 +162,7 @@ tests:
   - it: should pass with cnpg manualBackups backup created with namespace from global with tpl
     set:
       credentials:
-        test:
-          type: se
-          url: some-url
-          secretKey: some-secret-key
-          accessKey: some-access-key
+        test: *test
       key: global-namespace
       global:
         namespace: "{{ .Values.key }}"
@@ -197,11 +189,7 @@ tests:
   - it: should pass with cnpg manualBackups backup created with namespace from root with tpl
     set:
       credentials:
-        test:
-          type: s3
-          url: some-url
-          secretKey: some-secret-key
-          accessKey: some-access-key
+        test: *test
       key: local-namespace
       namespace: "{{ .Values.key }}"
       global:
@@ -229,11 +217,7 @@ tests:
   - it: should pass with cnpg manualBackups backup created with namespace in TrueNAS SCALE
     set:
       credentials:
-        test:
-          type: s3
-          url: some-url
-          secretKey: some-secret-key
-          accessKey: some-access-key
+        test: *test
       global:
         ixChartContext:
           iAmNotEmpty: true
diff --git a/library/common-test/tests/cnpg/backup_name_test.yaml b/library/common-test/tests/cnpg/backup_name_test.yaml
index 6084ba51..33c08b44 100644
--- a/library/common-test/tests/cnpg/backup_name_test.yaml
+++ b/library/common-test/tests/cnpg/backup_name_test.yaml
@@ -9,8 +9,11 @@ tests:
     set:
       credentials:
         test:
-          type: azure
-          connectionString: some-connection-string
+          type: s3
+          encrKey: some-encr-key
+          accessKey: some-access-key
+          secretKey: some-secret-key
+          url: some-url
       cnpg:
         my-pg:
           enabled: true
diff --git a/library/common-test/tests/cnpg/backup_provider_secret_spec_test.yaml b/library/common-test/tests/cnpg/backup_provider_secret_spec_test.yaml
index 85960a49..88097831 100644
--- a/library/common-test/tests/cnpg/backup_provider_secret_spec_test.yaml
+++ b/library/common-test/tests/cnpg/backup_provider_secret_spec_test.yaml
@@ -11,6 +11,8 @@ tests:
         test:
           type: s3
           url: some-url
+          encrKey: some-encr-key
+          bucket: some-bucket
           secretKey: some-secret-key
           accessKey: some-access-key
       cnpg: