1 files changed, 2 insertions, 5 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java
index 13589c763e2..59b7110e96e 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java
@@ -16,7 +16,7 @@ import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.admin.monitoring.Metric;
 import com.yahoo.vespa.model.test.VespaModelTester;
 
-import static com.yahoo.vespa.model.admin.monitoring.DefaultMetricsConsumer.VESPA_CONSUMER_ID;
+import static com.yahoo.vespa.model.admin.monitoring.VespaMetricsConsumer.VESPA_CONSUMER_ID;
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -27,7 +27,6 @@ class MetricsProxyModelTester {
     static final String MY_TENANT = "mytenant";
     static final String MY_APPLICATION = "myapp";
     static final String MY_INSTANCE = "myinstance";
-    static final String MY_FLAVOR = "myflavor";
 
     static final String CLUSTER_CONFIG_ID = "admin/metrics";
 
@@ -37,7 +36,6 @@ class MetricsProxyModelTester {
     static VespaModel getModel(String servicesXml) {
         var numberOfHosts = 1;
         var tester = new VespaModelTester();
-        tester.enableMetricsProxyContainer(true);
         tester.addHosts(numberOfHosts);
         tester.setHosted(false);
         return tester.createModel(servicesXml, true);
@@ -46,8 +44,7 @@ class MetricsProxyModelTester {
     static VespaModel getHostedModel(String servicesXml) {
         var numberOfHosts = 2;
         var tester = new VespaModelTester();
-        tester.enableMetricsProxyContainer(true);
-        tester.addHosts(flavorFromString(MY_FLAVOR), numberOfHosts);
+        tester.addHosts(numberOfHosts);
         tester.setHosted(true);
         tester.setApplicationId(MY_TENANT, MY_APPLICATION, MY_INSTANCE);
         return tester.createModel(servicesXml, true);