diff --git a/src/common/test_tools/plugin.py b/src/common/test_tools/plugin.py
index b0914b5..8597e7b 100644
--- a/src/common/test_tools/plugin.py
+++ b/src/common/test_tools/plugin.py
@@ -11,6 +11,11 @@ def assert_metric_impl() -> Generator[AssertMetricFixture, None, None]:
     registry = prometheus_client.REGISTRY
     collectors = [*registry._collector_to_names]
 
+    # Reset registry state
+    for collector in collectors:
+        if isinstance(collector, MetricWrapperBase):
+            collector.clear()
+
     def _assert_metric(
         *,
         name: str,
@@ -25,10 +30,5 @@ def _assert_metric(
 
     yield _assert_metric
 
-    # Reset registry state
-    for collector in collectors:
-        if isinstance(collector, MetricWrapperBase):
-            collector.clear()
-
 
 assert_metric = pytest.fixture(assert_metric_impl)