diff --git a/server/src/test/java/org/opensearch/index/query/QueryShapeVisitorTests.java b/server/src/test/java/org/opensearch/index/query/QueryShapeVisitorTests.java
index 53875cf078941..3c989bbe28595 100644
--- a/server/src/test/java/org/opensearch/index/query/QueryShapeVisitorTests.java
+++ b/server/src/test/java/org/opensearch/index/query/QueryShapeVisitorTests.java
@@ -23,7 +23,6 @@ public void testQueryShapeVisitor() {
             .must(new TermsQueryBuilder("genre", "action", "drama", "romance"));
         QueryShapeVisitor shapeVisitor = new QueryShapeVisitor();
         builder.visit(shapeVisitor);
-        // {"type":"bool","must"[{"type":"term"},{"type":"terms"}],"filter"[{"type":"constant_score","filter"[{"type":"range"}]}],"should"[{"type":"bool","must"[{"type":"match"}],"must_not"[{"type":"regexp"}]}]}
         assertEquals(
             "{\"type\":\"bool\",\"must\"[{\"type\":\"term\"},{\"type\":\"terms\"}],\"filter\"[{\"type\":\"constant_score\",\"filter\"[{\"type\":\"range\"}]}],\"should\"[{\"type\":\"bool\",\"must\"[{\"type\":\"match\"}],\"must_not\"[{\"type\":\"regexp\"}]}]}",
             shapeVisitor.toJson()
diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java
index 73758f3852227..2f9f38d18a064 100644
--- a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java
+++ b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java
@@ -222,6 +222,7 @@
 import org.opensearch.search.query.QueryPhase;
 import org.opensearch.snapshots.mockstore.MockEventuallyConsistentRepository;
 import org.opensearch.tasks.TaskResourceTrackingService;
+import org.opensearch.telemetry.metrics.noop.NoopMetricsRegistry;
 import org.opensearch.telemetry.tracing.noop.NoopTracer;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.test.disruption.DisruptableMockTransport;
@@ -2303,7 +2304,7 @@ public void onFailure(final Exception e) {
                             client
                         ),
                         null,
-                        null
+                        NoopMetricsRegistry.INSTANCE
                     )
                 );
                 actions.put(