diff --git a/argo_workflows/tests/conftest.py b/argo_workflows/tests/conftest.py
index 097d6692644c4..21e77680a0fe3 100644
--- a/argo_workflows/tests/conftest.py
+++ b/argo_workflows/tests/conftest.py
@@ -1,18 +1,20 @@
 # (C) Datadog, Inc. 2024-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
+import json
 import os
-from contextlib import ExitStack
 
 import pytest
 
 from datadog_checks.dev import get_here
+from datadog_checks.dev._env import get_state, save_state
 from datadog_checks.dev.kind import kind_run
-from datadog_checks.dev.kube_port_forward import port_forward
 from datadog_checks.dev.subprocess import run_command
 
 HERE = get_here()
 
+CONTROLLER_IP_STATE = 'argo_workflows_controller_ip'
+
 
 def setup_argo_wf():
     run_command(["kubectl", "create", "ns", "argo"])
@@ -22,19 +24,31 @@ def setup_argo_wf():
     )
     # run_command(["kubectl", "wait", "pods", "--all", "--for=condition=Ready", "--timeout=300s"])
 
+    # This only runs once, when the Kind cluster is created, so the resolved pod IP is cached here
+    # rather than re-resolved by `dd_environment` on every invocation.
+    save_state(CONTROLLER_IP_STATE, get_workflow_controller_pod_ip())
+
+
+def get_workflow_controller_pod_ip() -> str:
+    # There is no Service for workflow-controller, so the pod IP is fetched directly.
+    result = run_command(
+        ["kubectl", "get", "pods", "--namespace", "argo", "--selector", "app=workflow-controller", "--output", "json"],
+        capture='out',
+        check=True,
+    )
+    pods = json.loads(result.stdout)['items']
+    if len(pods) != 1 or not pods[0].get('status', {}).get('podIP'):
+        raise RuntimeError(f'Expected exactly one ready workflow-controller pod, found {len(pods)}')
+    return pods[0]['status']['podIP']
+
 
 @pytest.fixture(scope='session')
 def dd_environment():
     with kind_run(conditions=[setup_argo_wf]) as kubeconfig:
-        with ExitStack() as stack:
-            controller_host, controller_port = stack.enter_context(
-                # there is no service for workflow-controller
-                port_forward(kubeconfig, 'argo', 9090, 'deployment', 'workflow-controller')
-            )
-            # save this instance to use for openmetrics_v2 instance, since the endpoint is different each run
-            # dd_save_state("argocd_instance", instance)
-
-            yield {'openmetrics_endpoint': f'http://{controller_host}:{controller_port}/metrics'}
+        controller_ip = get_state(CONTROLLER_IP_STATE)
+        metadata = {'agent_type': 'kubernetes', 'kubernetes': {'kubeconfig': kubeconfig}}
+
+        yield {'openmetrics_endpoint': f'http://{controller_ip}:9090/metrics'}, metadata
 
 
 @pytest.fixture