diff --git a/tracer/test/Datadog.Trace.Tests/Telemetry/Metrics/MetricTests.cs b/tracer/test/Datadog.Trace.Tests/Telemetry/Metrics/MetricTests.cs
index 15bb836107a1..2a2968b846a0 100644
--- a/tracer/test/Datadog.Trace.Tests/Telemetry/Metrics/MetricTests.cs
+++ b/tracer/test/Datadog.Trace.Tests/Telemetry/Metrics/MetricTests.cs
@@ -35,8 +35,8 @@ public class MetricTests
     private static readonly Dictionary<string, string[]> OptionalTagsByMetricName = new()
     {
         { "event_created", new[] { "has_codeowner", "is_unsupported_ci", "is_benchmark" } },
-        { "event_finished", new[] { "has_codeowner", "is_unsupported_ci", "is_benchmark", "is_new", "early_flake_detection_abort_reason", "browser_driver", "is_rum" } },
-        { "git_requests.settings_response", new[] { "coverage_enabled", "itrskip_enabled", "early_flake_detection_enabled" } },
+        { "event_finished", new[] { "has_codeowner", "is_unsupported_ci", "is_benchmark", "is_new", "early_flake_detection_abort_reason", "browser_driver", "is_rum", "agentless_log_submission_enabled" } },
+        { "git_requests.settings_response", new[] { "coverage_enabled", "itrskip_enabled", "early_flake_detection_enabled", "flaky_test_retries_enabled" } },
         { "endpoint_payload.requests_errors", ["status_code"] },
         { "git_requests.search_commits_errors", ["status_code"] },
         { "git_requests.objects_pack_errors", ["status_code"] },
diff --git a/tracer/test/Datadog.Trace.Tests/Telemetry/Metrics/common_metrics.json b/tracer/test/Datadog.Trace.Tests/Telemetry/Metrics/common_metrics.json
index c058438eca59..bc846be12b44 100644
--- a/tracer/test/Datadog.Trace.Tests/Telemetry/Metrics/common_metrics.json
+++ b/tracer/test/Datadog.Trace.Tests/Telemetry/Metrics/common_metrics.json
@@ -904,7 +904,8 @@
     "test_session": {
       "tags": [
         "provider",
-        "auto_injected"
+        "auto_injected",
+        "agentless_log_submission_enabled",
       ],
       "metric_type": "count",
       "data_type": "events",
@@ -1195,6 +1196,7 @@
       "tags": [
         "coverage_enabled",
         "itrskip_enabled",
+        "flaky_test_retries_enabled",
         "early_flake_detection_enabled"
       ],
       "metric_type": "count",