diff --git a/charts/cluster/values.yaml b/charts/cluster/values.yaml
index 7ba57c5d9..b913c600f 100644
--- a/charts/cluster/values.yaml
+++ b/charts/cluster/values.yaml
@@ -157,7 +157,7 @@ cluster:
   # -- Configuration of the PostgreSQL server
   # See: https://cloudnative-pg.io/documentation/current/cloudnative-pg.v1/#postgresql-cnpg-io-v1-PostgresConfiguration
   postgresql: {}
-    # max_connections: 300
+    # max_connections: "300"
 
   # -- BootstrapInitDB is the configuration of the bootstrap process when initdb is used
   # See: https://cloudnative-pg.io/documentation/current/bootstrap/
diff --git a/tests/cluster/00-cluster.yaml b/tests/cluster/00-cluster.yaml
index ba97eced6..807cb254f 100644
--- a/tests/cluster/00-cluster.yaml
+++ b/tests/cluster/00-cluster.yaml
@@ -1,15 +1,12 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-  - script: kubectl get secret/myminio-tls -n minio -o json | jq 'del(.metadata["namespace","creationTimestamp","resourceVersion","selfLink","uid","ownerReferences"])' | kubectl apply --namespace=$NAMESPACE -f -
+  - script: kubectl -n $NAMESPACE create secret generic kube-root-ca.crt --from-literal=ca.crt="$(kubectl -n kube-system get configmaps kube-root-ca.crt -o jsonpath='{.data.ca\.crt}')" --dry-run=client -o yaml | kubectl apply -f -
   - namespaced: true
     command:
       helm upgrade
         --install
-        --namespace database
-        --create-namespace
         --values ./standalone.yaml
         --wait
-        database ../../charts/cluster
-  - command: sleep 180
-timeout: 120
+        standalone ../../charts/cluster
+timeout: 180
diff --git a/tests/cluster/standalone.yaml b/tests/cluster/standalone.yaml
index 1e34864c8..d0378a597 100644
--- a/tests/cluster/standalone.yaml
+++ b/tests/cluster/standalone.yaml
@@ -1,17 +1,15 @@
 mode: standalone
 cluster:
-  instances: 1
-  env:
-    - name: AWS_CA_BUNDLE
-      value: /run/certificates/backup-barman-ca.crt
-
+  instances: 2
+  postgresql:
+    archive_timout: "10"
 backups:
   enabled: true
   provider: s3
   endpointURL: "https://minio.minio.svc.cluster.local"
   endpointCA:
-    name: myminio-tls
-    key: public.crt
+    name: kube-root-ca.crt
+    key: ca.crt
   wal:
     encryption: ""
   data: