diff --git a/src/test_data.py b/src/test_data.py
index 697ee050..95dbca9f 100644
--- a/src/test_data.py
+++ b/src/test_data.py
@@ -251,7 +251,6 @@ METRICS_WITH_INITIAL_VALUE_ZERO = [
     "presto_server_missing_requests_count",
     "presto_server_invalid_requests_count",
     'waku_archive_messages{type="stored"}',
-    "waku_archive_queries",
     "waku_archive_insert_duration_seconds_sum",
     "waku_archive_insert_duration_seconds_count",
     'waku_archive_insert_duration_seconds_bucket{le="0.005"}',
@@ -286,7 +285,6 @@ METRICS_WITH_INITIAL_VALUE_ZERO = [
     'waku_archive_query_duration_seconds_bucket{le="7.5"}',
     'waku_archive_query_duration_seconds_bucket{le="10.0"}',
     'waku_archive_query_duration_seconds_bucket{le="+Inf"}',
-    "waku_legacy_archive_queries",
     "waku_legacy_archive_insert_duration_seconds_sum",
     "waku_legacy_archive_insert_duration_seconds_count",
     'waku_legacy_archive_insert_duration_seconds_bucket{le="0.005"}',
@@ -321,8 +319,6 @@ METRICS_WITH_INITIAL_VALUE_ZERO = [
     'waku_legacy_archive_query_duration_seconds_bucket{le="7.5"}',
     'waku_legacy_archive_query_duration_seconds_bucket{le="10.0"}',
     'waku_legacy_archive_query_duration_seconds_bucket{le="+Inf"}',
-    "waku_legacy_store_queries",
-    "waku_store_queries",
     "waku_filter_subscriptions",
     "waku_filter_handle_message_duration_seconds_sum",
     "waku_filter_handle_message_duration_seconds_count",
@@ -346,7 +342,6 @@ METRICS_WITH_INITIAL_VALUE_ZERO = [
     "discovery_session_decrypt_failures_total",
     "discovery_unsolicited_messages_total",
     "discovery_enr_auto_update_total",
-    "waku_discv5_discovered",
     "waku_px_peers_received_total",
     "waku_px_peers_received_unknown",
     "waku_px_peers_sent_total",
@@ -396,4 +391,7 @@ METRICS_WITH_INITIAL_VALUE_ZERO = [
     'waku_filter_handle_message_duration_seconds_bucket{le="20.0"}',
     'waku_filter_handle_message_duration_seconds_bucket{le="30.0"}',
     "total_messages_cached",
+    'waku_connected_peers_per_shard{shard="0"}',
+    "waku_legacy_store_queries_total",
+    "waku_store_queries_total",
 ]
diff --git a/tests/metrics/test_metrics.py b/tests/metrics/test_metrics.py
index ef4e4b61..25eb9791 100644
--- a/tests/metrics/test_metrics.py
+++ b/tests/metrics/test_metrics.py
@@ -47,7 +47,6 @@ class TestMetrics(StepsRelay, StepsMetrics, StepsFilter, StepsLightPush, StepsSt
         self.check_metric(self.node1, "waku_peer_store_size", 1)
         self.check_metric(self.node1, "waku_histogram_message_size_count", 1)
         self.check_metric(self.node1, 'waku_node_messages_total{type="relay"}', 1)
-        self.check_metric(self.node1, 'waku_filter_requests{type="SUBSCRIBE"}', 1)
         if self.node2.is_nwaku():
             self.check_metric(
                 self.node2, f'waku_service_peers{{protocol="/vac/waku/filter-subscribe/2.0.0-beta1",peerId="{self.node1.get_tcp_address()}"}}', 1