diff --git a/geronimo-metrics-extensions/geronimo-metrics-sigar/src/test/java/org/apache/geronimo/microprofile/metrics/extension/sigar/SigarTest.java b/geronimo-metrics-extensions/geronimo-metrics-sigar/src/test/java/org/apache/geronimo/microprofile/metrics/extension/sigar/SigarTest.java
index 4c5934c..6442768 100644
--- a/geronimo-metrics-extensions/geronimo-metrics-sigar/src/test/java/org/apache/geronimo/microprofile/metrics/extension/sigar/SigarTest.java
+++ b/geronimo-metrics-extensions/geronimo-metrics-sigar/src/test/java/org/apache/geronimo/microprofile/metrics/extension/sigar/SigarTest.java
@@ -55,7 +55,7 @@
                                              .collect(toList());
         assertTrue(keys.toString(), keys.size() > 10 /*whatever, just check it is registered*/);
         // ensure gauge is usable
-        final Object cpu = registry.getGauges().get("sigar.cpu.total").getValue();
+        final Object cpu = registry.getGauges().get(new MetricID("sigar.cpu.total")).getValue();
         assertNotNull(cpu);
     }
 }
diff --git a/geronimo-metrics-extensions/geronimo-metrics-tomcat/src/test/java/org/apache/geronimo/microprofile/metrics/extension/tomcat/TomcatExtensionTest.java b/geronimo-metrics-extensions/geronimo-metrics-tomcat/src/test/java/org/apache/geronimo/microprofile/metrics/extension/tomcat/TomcatExtensionTest.java
index 2576f3a..438ca60 100644
--- a/geronimo-metrics-extensions/geronimo-metrics-tomcat/src/test/java/org/apache/geronimo/microprofile/metrics/extension/tomcat/TomcatExtensionTest.java
+++ b/geronimo-metrics-extensions/geronimo-metrics-tomcat/src/test/java/org/apache/geronimo/microprofile/metrics/extension/tomcat/TomcatExtensionTest.java
@@ -24,6 +24,7 @@
 import org.apache.meecrowave.Meecrowave;
 import org.apache.meecrowave.junit.MeecrowaveRule;
 import org.eclipse.microprofile.metrics.Gauge;
+import org.eclipse.microprofile.metrics.MetricID;
 import org.eclipse.microprofile.metrics.MetricRegistry;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -40,7 +41,7 @@
                                .select(MetricRegistry.class, new RegistryTypeLiteral(MetricRegistry.Type.BASE))
                                .get()
                                .getGauges()
-                               .get("server.executor.port_" + MEECROWAVE.getConfiguration().getHttpPort() + ".active");
+                               .get(new MetricID("server.executor.port_" + MEECROWAVE.getConfiguration().getHttpPort() + ".active"));
         assertNotNull(gauge);
         assertNotNull(gauge.getValue());
     }