diff --git a/charts/db-instances/files/test_service_monitor b/charts/db-instances/files/test_monitoring
similarity index 100%
rename from charts/db-instances/files/test_service_monitor
rename to charts/db-instances/files/test_monitoring
diff --git a/charts/db-instances/templates/tests/test_service_monitor.yaml b/charts/db-instances/templates/tests/test_monitoring.yaml
similarity index 84%
rename from charts/db-instances/templates/tests/test_service_monitor.yaml
rename to charts/db-instances/templates/tests/test_monitoring.yaml
index dc2154b..3fa5063 100644
--- a/charts/db-instances/templates/tests/test_service_monitor.yaml
+++ b/charts/db-instances/templates/tests/test_monitoring.yaml
@@ -1,6 +1,6 @@
-{{- if (((.Values.tests).serviceMonitor).enabled) }}
+{{- if .Values.tests.monitoring.enabled }}
 # ---------------------------------------------------------------------
-# -- A config map with a script to test serviceMonitor
+# -- A config map with a script to test monitoring
 # ---------------------------------------------------------------------
 --- 
 apiVersion: v1
@@ -40,9 +40,9 @@ spec:
       volumeMounts:
         - name: test-script
           readOnly: true
-          mountPath: /test_service_monitor
-          subPath: test_service_monitor
+          mountPath: /test_monitoring
+          subPath: test_monitoring
       args:
-        - /test.sh
+        - /test_monitoring
   restartPolicy: Never
 {{- end}}
diff --git a/charts/db-instances/values.yaml b/charts/db-instances/values.yaml
index e09b5ed..d90b590 100644
--- a/charts/db-instances/values.yaml
+++ b/charts/db-instances/values.yaml
@@ -15,7 +15,6 @@ postgresql:
 # --  don't have an intention of testing the helm chart
 # ---------------------------------------------------------------------
 tests:
-  # Test that service monitor can be created
-  # and metrics can be scraped by Prometheus
-  serviceMonitor:
+  # Test that the metrics can be scraped by Prometheus
+  monitoring:
     enabled: false