diff --git a/implementations/micrometer-registry-signalfx/src/test/java/io/micrometer/signalfx/SignalFxMeterRegistryTest.java b/implementations/micrometer-registry-signalfx/src/test/java/io/micrometer/signalfx/SignalFxMeterRegistryTest.java
index 0d73fe89bb..bec47cb937 100644
--- a/implementations/micrometer-registry-signalfx/src/test/java/io/micrometer/signalfx/SignalFxMeterRegistryTest.java
+++ b/implementations/micrometer-registry-signalfx/src/test/java/io/micrometer/signalfx/SignalFxMeterRegistryTest.java
@@ -562,7 +562,13 @@ private static Condition<SignalFxProtocolBuffers.DataPoint> gaugePoint(String na
     private static Condition<SignalFxProtocolBuffers.DataPoint> hasValue(double value) {
         return new Condition<>(point -> {
             SignalFxProtocolBuffers.Datum v = point.getValue();
-            return v.getDoubleValue() == value || v.getIntValue() == (int) value;
+            if (v.hasDoubleValue()) {
+                return v.getDoubleValue() == value;
+            }
+            if (v.hasIntValue()) {
+                return v.getIntValue() == (int) value;
+            }
+            return false;
         }, "Has value %s", value);
     }