diff --git a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
index 217c07433e4..6fc0f697105 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java
@@ -922,7 +922,7 @@ public void testPrometheusMetricsJvm() throws Exception {
     actualGaugeDataPoint =
         getGaugeDatapointSnapshot(
             actualSnapshot, Labels.of("item", "committed", "space", "CodeHeap-'non-nmethods'"));
-    assertEquals(0, actualGaugeDataPoint.getValue(), 0);
+    assertNotNull(actualGaugeDataPoint);
 
     actualSnapshot = getMetricSnapshot(actualSnapshots, "solr_metrics_jvm_buffers");
     actualGaugeDataPoint =
diff --git a/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java
index f46f5a0f85d..c183a2610f6 100644
--- a/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java
+++ b/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java
@@ -35,6 +35,7 @@
 import org.junit.Test;
 
 /** Tests the {@link PrometheusResponseWriter} behavior */
+@LuceneTestCase.AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-17368")
 public class TestPrometheusResponseWriter extends SolrTestCaseJ4 {
 
   @ClassRule public static SolrJettyTestRule solrClientTestRule = new SolrJettyTestRule();