diff --git a/test/behave/features/environment.py b/test/behave/features/environment.py
index c07e349a24b5f16b276943f3ed2f7f62f178e754..8f696569f1c5e9f08a57db14349881c608df288f 100644
--- a/test/behave/features/environment.py
+++ b/test/behave/features/environment.py
@@ -5,7 +5,7 @@ def before_tag(context, tag):
     """Define steps run before each tag."""
 
     userdata = context.config.userdata
-    if tag == 'grafana':
+    if tag == 'prometheus-stack':
         context.grafana = get_values(userdata, 'grafana')
 
     if tag == 'nextcloud':
diff --git a/test/pytest/test_prometheus.py b/test/pytest/test_prometheus.py
index 9ddcdb9a3d29f9dd2a334e54f54f308f00085435..a89ce5b9bf922bdd6c420e0d36c1c7c32b8d6c4d 100755
--- a/test/pytest/test_prometheus.py
+++ b/test/pytest/test_prometheus.py
@@ -64,7 +64,7 @@ def test_prometheus_alerts(host):
 
     print("Starting prometheus test...")
 
-    url = 'http://prometheus-server.oas.svc.cluster.local/api/v1/alerts'
+    url = 'http://prometheus-stack-kube-prom-prometheus.oas.svc.cluster.local:9090/api/v1/alerts'
 
     alert_json = json.loads(host.check_output('curl ' + url))
     status = alert_json["status"]