diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java
index 2098ce9d87b..ed68bd0eafd 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java
@@ -344,7 +344,8 @@ public Map<TestSetting, Map<String, Collection<TestFQN>>> getTestManagementTests
                 new TestManagementDto(
                     tracerEnvironment.getRepositoryUrl(),
                     tracerEnvironment.getCommitMessage(),
-                    tracerEnvironment.getConfigurations().getTestBundle())));
+                    tracerEnvironment.getConfigurations().getTestBundle(),
+                    tracerEnvironment.getSha())));
     String json = testManagementRequestAdapter.toJson(request);
     RequestBody requestBody = RequestBody.create(JSON, json);
     TestManagementTestsDto testManagementTestsDto =
@@ -542,11 +543,14 @@ private static final class TestManagementDto {
     private final String commitMessage;
 
     private final String module;
+    private final String sha;
 
-    private TestManagementDto(String repositoryUrl, String commitMessage, String module) {
+    private TestManagementDto(
+        String repositoryUrl, String commitMessage, String module, String sha) {
       this.repositoryUrl = repositoryUrl;
       this.commitMessage = commitMessage;
       this.module = module;
+      this.sha = sha;
     }
   }
 
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java
index f149c91b2f0..4dfe62b24bf 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java
@@ -262,9 +262,12 @@ public void onTestFinish(
 
       if (testExecutionHistory.hasFailedAllRetries()) {
         test.setTag(Tags.TEST_HAS_FAILED_ALL_RETRIES, true);
-      } else if (testExecutionHistory.hasSucceededAllRetries()
-          && testModule.isAttemptToFix(thisTest)) {
-        test.setTag(Tags.TEST_TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, true);
+      }
+
+      if (testExecutionHistory.wasLastExecution() && testModule.isAttemptToFix(thisTest)) {
+        test.setTag(
+            Tags.TEST_TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
+            testExecutionHistory.hasSucceededAllRetries());
       }
     }
 
diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/test-management-tests-request.ftl b/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/test-management-tests-request.ftl
index d16b3e43c8d..b6ae9190501 100644
--- a/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/test-management-tests-request.ftl
+++ b/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/test-management-tests-request.ftl
@@ -4,7 +4,8 @@
     "id"        : "${uid}",
     "attributes": {
       "repository_url"  : "${tracerEnvironment.repositoryUrl}",
-      "commit_message"  : "${tracerEnvironment.commitMessage}"
+      "commit_message"  : "${tracerEnvironment.commitMessage}",
+      "sha"             : "${tracerEnvironment.sha}"
       }
     }
   }
diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy
index 01ba099838d..654a6018db7 100644
--- a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy
+++ b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy
@@ -4,15 +4,16 @@ import datadog.trace.api.civisibility.config.TestFQN
 import spock.lang.Specification
 
 abstract class CiVisibilitySmokeTest extends Specification {
+  static final List<String> SMOKE_IGNORED_TAGS = ["content.meta.['_dd.integration']"]
 
   protected verifyEventsAndCoverages(String projectName, String toolchain, String toolchainVersion, List<Map<String, Object>> events, List<Map<String, Object>> coverages) {
     def additionalReplacements = ["content.meta.['test.toolchain']": "$toolchain:$toolchainVersion"]
 
     if (System.getenv().get("GENERATE_TEST_FIXTURES") != null) {
       def baseTemplatesPath = CiVisibilitySmokeTest.classLoader.getResource(projectName).toURI().schemeSpecificPart.replace('build/resources/test', 'src/test/resources')
-      CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements)
+      CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements, SMOKE_IGNORED_TAGS)
     } else {
-      CiVisibilityTestUtils.assertData(projectName, events, coverages, additionalReplacements,["content.meta.['_dd.integration']"])
+      CiVisibilityTestUtils.assertData(projectName, events, coverages, additionalReplacements, SMOKE_IGNORED_TAGS)
     }
   }
 
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
index 46ee043c406..c70c4e06623 100644
--- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
@@ -254,6 +254,7 @@
       "test.retry_reason" : "attempt_to_fix",
       "test.status" : "fail",
       "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_test_disabled" : "true",
       "test.traits" : "{\"category\":[\"foo\"]}",
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl
index 5039ebefc3c..6276c3b02cd 100644
--- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl
@@ -250,6 +250,7 @@
       "test.retry_reason" : "attempt_to_fix",
       "test.status" : "fail",
       "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.traits" : "{\"category\":[\"foo\"]}",
       "test.type" : "test",
diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
index 58f2dd7f314..b1c5623653a 100644
--- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
@@ -254,6 +254,7 @@
       "test.retry_reason" : "attempt_to_fix",
       "test.status" : "fail",
       "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_quarantined" : "true",
       "test.traits" : "{\"category\":[\"foo\"]}",
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
index 3cc647b3962..275963b4388 100644
--- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
@@ -336,6 +336,7 @@
       "test.source.file" : "dummy_source_path",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailedMUnit",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_test_disabled" : "true",
       "test.traits" : "{\"category\":[\"myTag\"]}",
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl
index b2f81d70dc4..9fa0f83b7d7 100644
--- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl
@@ -332,6 +332,7 @@
       "test.source.file" : "dummy_source_path",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailedMUnit",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.traits" : "{\"category\":[\"myTag\"]}",
       "test.type" : "test",
diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
index 68a49579de4..309ff4bd5bf 100644
--- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
@@ -336,6 +336,7 @@
       "test.source.file" : "dummy_source_path",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailedMUnit",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_quarantined" : "true",
       "test.traits" : "{\"category\":[\"myTag\"]}",
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
index 71c4f6a6c4e..4e386dd4db1 100644
--- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
@@ -340,6 +340,7 @@
       "test.source.method" : "test_failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_test_disabled" : "true",
       "test.type" : "test",
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-failed/events.ftl
index 59ae568ed34..696d74c6799 100644
--- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-failed/events.ftl
@@ -336,6 +336,7 @@
       "test.source.method" : "test_failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.type" : "test",
       "test_session.name" : "session-name"
diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
index 44eda3db707..f821eb84bf3 100644
--- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
@@ -340,6 +340,7 @@
       "test.source.method" : "test_failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_quarantined" : "true",
       "test.type" : "test",
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
index 674f08e75bc..00b3ec7e618 100644
--- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
@@ -254,6 +254,7 @@
       "test.retry_reason" : "attempt_to_fix",
       "test.status" : "fail",
       "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_test_disabled" : "true",
       "test.traits" : "{\"category\":[\"foo\"]}",
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl
index 678d4f32dea..afc28e8e7c9 100644
--- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl
@@ -250,6 +250,7 @@
       "test.retry_reason" : "attempt_to_fix",
       "test.status" : "fail",
       "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.traits" : "{\"category\":[\"foo\"]}",
       "test.type" : "test",
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
index 95bc7ffd5cc..dfeb0864424 100644
--- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
@@ -254,6 +254,7 @@
       "test.retry_reason" : "attempt_to_fix",
       "test.status" : "fail",
       "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_quarantined" : "true",
       "test.traits" : "{\"category\":[\"foo\"]}",
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
index e47391e2bfa..21c32d42563 100644
--- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
@@ -277,6 +277,7 @@
       "test.source.method" : "test failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailedSpock",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_test_disabled" : "true",
       "test.type" : "test",
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl
index e778923fe35..3f4fef56530 100644
--- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl
@@ -273,6 +273,7 @@
       "test.source.method" : "test failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailedSpock",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.type" : "test",
       "test_session.name" : "session-name"
diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
index df4e664f472..fb7e10b5e82 100644
--- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
@@ -277,6 +277,7 @@
       "test.source.method" : "test failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailedSpock",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_quarantined" : "true",
       "test.type" : "test",
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
index 58eadd19064..bfc49d795dc 100644
--- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
@@ -345,6 +345,7 @@
       "test.source.method" : "test_failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_test_disabled" : "true",
       "test.type" : "test",
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-failed/events.ftl
index b6f3db653c7..198038b33ac 100644
--- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-failed/events.ftl
@@ -341,6 +341,7 @@
       "test.source.method" : "test_failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.type" : "test",
       "test_session.name" : "session-name"
diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
index af37ee201ca..13a34b883e3 100644
--- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
+++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
@@ -345,6 +345,7 @@
       "test.source.method" : "test_failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_quarantined" : "true",
       "test.type" : "test",
diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
index f7e90f4736c..53ff10bfa3e 100644
--- a/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
+++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
@@ -436,6 +436,7 @@
       "test.retry_reason" : "attempt_to_fix",
       "test.status" : "fail",
       "test.suite" : "[org/example/test_failed] test failed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_test_disabled" : "true",
       "test.type" : "test",
diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-failed/events.ftl
index df8dc8c80dd..7adee633ea4 100644
--- a/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-failed/events.ftl
+++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-failed/events.ftl
@@ -435,6 +435,7 @@
       "test.retry_reason" : "attempt_to_fix",
       "test.status" : "fail",
       "test.suite" : "[org/example/test_failed] test failed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.type" : "test",
       "test_session.name" : "session-name"
diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
index 66b948fef91..0d31dbe41dc 100644
--- a/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
+++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
@@ -436,6 +436,7 @@
       "test.retry_reason" : "attempt_to_fix",
       "test.status" : "fail",
       "test.suite" : "[org/example/test_failed] test failed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_quarantined" : "true",
       "test.type" : "test",
diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
index 75e2938bf2c..65f5b094476 100644
--- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
+++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
@@ -264,6 +264,7 @@
       "test.source.file" : "dummy_source_path",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_test_disabled" : "true",
       "test.type" : "test",
diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-failed/events.ftl
index 869aaddf34c..4283451f8bd 100644
--- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-failed/events.ftl
+++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-failed/events.ftl
@@ -260,6 +260,7 @@
       "test.source.file" : "dummy_source_path",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.type" : "test",
       "test_session.name" : "session-name"
diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
index 2fe1c941979..d6c7ebbeaae 100644
--- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
+++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
@@ -264,6 +264,7 @@
       "test.source.file" : "dummy_source_path",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_quarantined" : "true",
       "test.type" : "test",
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
index dfd78d2e054..6118a0f30f0 100644
--- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
@@ -277,6 +277,7 @@
       "test.source.method" : "test_failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_test_disabled" : "true",
       "test.type" : "test",
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-failed/events.ftl
index fdf7aa3959d..ca6d65d29e8 100644
--- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-failed/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-failed/events.ftl
@@ -273,6 +273,7 @@
       "test.source.method" : "test_failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.type" : "test",
       "test_session.name" : "session-name"
diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
index 1b12a1db556..48e9047ccaa 100644
--- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
+++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
@@ -277,6 +277,7 @@
       "test.source.method" : "test_failed()V",
       "test.status" : "fail",
       "test.suite" : "org.example.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_quarantined" : "true",
       "test.type" : "test",
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl
index def5640c57b..27f652b7771 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl
@@ -243,7 +243,7 @@
       "_dd.library_capabilities.early_flake_detection" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_7},
@@ -305,7 +305,7 @@
       "_dd.library_capabilities.early_flake_detection" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_8},
@@ -369,7 +369,7 @@
       "_dd.library_capabilities.early_flake_detection" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_9},
@@ -433,7 +433,7 @@
       "_dd.library_capabilities.early_flake_detection" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_10},
@@ -497,7 +497,7 @@
       "_dd.library_capabilities.early_flake_detection" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_11},
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl
index d39acb2c290..3e567d7fbd6 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl
@@ -191,7 +191,7 @@
       "_dd.library_capabilities.early_flake_detection" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_6},
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl
index ed2f768404d..ec327629c9b 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl
@@ -243,7 +243,7 @@
       "_dd.library_capabilities.early_flake_detection" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_7},
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl
index 171db88f8f7..0b4234da1c9 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl
@@ -238,7 +238,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_7},
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl
index 2ccf73e373a..1793057f7b3 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl
@@ -240,7 +240,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_7},
@@ -301,7 +301,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_8},
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl
index cd356199d77..37b46d15064 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl
@@ -189,7 +189,7 @@
       "_dd.library_capabilities.early_flake_detection" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_6},
@@ -249,7 +249,7 @@
       "_dd.library_capabilities.early_flake_detection" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_7},
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl
index 786a207fe9f..b7c6996a965 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl
@@ -189,7 +189,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_6},
@@ -298,7 +298,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_8},
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl
index a87e9a2e32c..0c7feaeb029 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl
@@ -238,7 +238,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_7},
@@ -347,7 +347,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_9},
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl
index 86c8cfc55c6..567c3cef755 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl
@@ -195,7 +195,7 @@
       "_dd.library_capabilities.early_flake_detection" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_5},
@@ -255,7 +255,7 @@
       "_dd.library_capabilities.early_flake_detection" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_6},
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl
index fb292803f29..5876e9732ad 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl
@@ -244,7 +244,7 @@
       "_dd.library_capabilities.early_flake_detection" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_6},
@@ -304,7 +304,7 @@
       "_dd.library_capabilities.early_flake_detection" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_7},
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl
index 8ed830161db..5c3bc657bd1 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl
@@ -239,7 +239,7 @@
       "_dd.library_capabilities.early_flake_detection" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_7},
@@ -299,7 +299,7 @@
       "_dd.library_capabilities.early_flake_detection" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_8},
diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl
index b3be4e67298..06ad43757ae 100644
--- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl
+++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl
@@ -189,7 +189,7 @@
       "_dd.library_capabilities.early_flake_detection" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_6},
@@ -249,7 +249,7 @@
       "_dd.library_capabilities.early_flake_detection" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_7},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/events.ftl
index d2afe7b122e..a3dc22da696 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/events.ftl
@@ -310,7 +310,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_9},
@@ -373,7 +373,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_10},
@@ -438,7 +438,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_11},
@@ -503,7 +503,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_12},
@@ -568,7 +568,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_13},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl
index 2c16bf028a1..4e48ea85cff 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl
@@ -314,7 +314,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_9},
@@ -375,7 +375,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_10},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl
index 379f69d7ece..4281231d76c 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl
@@ -278,7 +278,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_8},
@@ -339,7 +339,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_9},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl
index 408b8037fcd..6ff34b20a28 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl
@@ -276,7 +276,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_8},
@@ -338,7 +338,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_9},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/events.ftl
index 721fc4e239a..6ee43069896 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/events.ftl
@@ -330,7 +330,7 @@
       "_dd.library_capabilities.early_flake_detection" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_10},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl
index 8affc7a1319..3d48b2479aa 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl
@@ -314,7 +314,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_9},
@@ -375,7 +375,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_10},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl
index 2c16bf028a1..4e48ea85cff 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl
@@ -314,7 +314,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_9},
@@ -375,7 +375,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_10},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl
index 2c16bf028a1..4e48ea85cff 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl
@@ -314,7 +314,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_9},
@@ -375,7 +375,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_10},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl
index d0e066fc11d..afe27bb6a55 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl
@@ -278,7 +278,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_8},
@@ -343,7 +343,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_9},
@@ -410,7 +410,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_10},
@@ -477,7 +477,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_11},
@@ -544,7 +544,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_12},
@@ -576,6 +576,7 @@
       "test.source.method" : "test_another_failed()V",
       "test.status" : "fail",
       "test.suite" : "datadog.smoke.TestFailed",
+      "test.test_management.attempt_to_fix_passed" : "false",
       "test.test_management.is_attempt_to_fix" : "true",
       "test.test_management.is_quarantined" : "true",
       "test.type" : "test",
@@ -612,7 +613,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_13},
@@ -724,7 +725,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_15},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/events.ftl
index 0236ad535e5..2d326ef7fb8 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/events.ftl
@@ -270,7 +270,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_8},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl
index 608a5ed70e7..2e80bb1eb96 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl
@@ -366,7 +366,7 @@
       "_dd.library_capabilities.auto_test_retries" : "1",
       "_dd.library_capabilities.early_flake_detection" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_11},
diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl
index 00b227bf3aa..d6a511b4287 100644
--- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl
+++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl
@@ -314,7 +314,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_9},
@@ -375,7 +375,7 @@
       "_dd.library_capabilities.fail_fast_test_order" : "1",
       "_dd.library_capabilities.impacted_tests" : "1",
       "_dd.library_capabilities.test_impact_analysis" : "1",
-      "_dd.library_capabilities.test_management.attempt_to_fix" : "2",
+      "_dd.library_capabilities.test_management.attempt_to_fix" : "4",
       "_dd.library_capabilities.test_management.disable" : "1",
       "_dd.library_capabilities.test_management.quarantine" : "1",
       "_dd.p.tid" : ${content_meta__dd_p_tid_10},
diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java b/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java
index 7df45849286..a4cae1cc209 100644
--- a/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java
+++ b/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java
@@ -8,7 +8,7 @@ public enum LibraryCapability {
   FAIL_FAST("fail_fast_test_order", "1"),
   QUARANTINE("test_management.quarantine", "1"),
   DISABLED("test_management.disable", "1"),
-  ATTEMPT_TO_FIX("test_management.attempt_to_fix", "2");
+  ATTEMPT_TO_FIX("test_management.attempt_to_fix", "4");
 
   private final String tag;
   private final String version;