DataDog
diff --git a/‎dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java
Lines changed: 1 addition & 10 deletions b/‎dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java
Lines changed: 1 addition & 10 deletions
diff --git a/‎dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java
Lines changed: 4 additions & 1 deletion b/‎dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java
Lines changed: 4 additions & 1 deletion
@@ -68,7 +68,6 @@ public class TestImpl implements DDTest {
   private final TestContext context;
   private final TestIdentifier identifier;
   private final long startMicros;
-  private TestStatus status;
 
   public TestImpl(
       AgentSpanContext moduleSpanContext,
@@ -138,7 +137,6 @@ public TestImpl(
     span.setTag(Tags.TEST_MODULE_ID, moduleSpanContext.getSpanId());
     span.setTag(Tags.TEST_SESSION_ID, moduleSpanContext.getTraceId());
 
-    status = TestStatus.pass;
     span.setTag(Tags.TEST_STATUS, TestStatus.pass);
 
     if (testClass != null && !testClass.getName().equals(testSuiteName)) {
@@ -210,10 +208,6 @@ public TestIdentifier getIdentifier() {
     return identifier;
   }
 
-  public boolean hasFailed() {
-    return span.isError();
-  }
-
   @Override
   public void setTag(String key, Object value) {
     span.setTag(key, value);
@@ -223,14 +217,11 @@ public void setTag(String key, Object value) {
   public void setErrorInfo(Throwable error) {
     span.setError(true);
     span.addThrowable(error);
-    status = TestStatus.fail;
     span.setTag(Tags.TEST_STATUS, TestStatus.fail);
   }
 
   @Override
   public void setSkipReason(String skipReason) {
-    status = TestStatus.skip;
-
     span.setTag(Tags.TEST_STATUS, TestStatus.skip);
     if (skipReason != null) {
       span.setTag(Tags.TEST_SKIP_REASON, skipReason);
@@ -244,7 +235,7 @@ public void setSkipReason(String skipReason) {
   }
 
   public TestStatus getStatus() {
-    return status;
+    return (TestStatus) span.getTag(Tags.TEST_STATUS);
   }
 
   public long getDuration(@Nullable Long endMicros) {
 
@@ -10,6 +10,7 @@
 import datadog.trace.api.civisibility.events.TestEventsHandler;
 import datadog.trace.api.civisibility.execution.TestExecutionHistory;
 import datadog.trace.api.civisibility.execution.TestExecutionPolicy;
+import datadog.trace.api.civisibility.execution.TestStatus;
 import datadog.trace.api.civisibility.telemetry.CiVisibilityCountMetric;
 import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector;
 import datadog.trace.api.civisibility.telemetry.tag.EventType;
@@ -255,7 +256,9 @@ public void onTestFinish(
 
     TestIdentifier thisTest = test.getIdentifier();
     if (testExecutionHistory != null) {
-      testExecutionHistory.registerExecution(test.getStatus(), test.getDuration(endTime));
+      TestStatus testStatus = test.getStatus();
+      testExecutionHistory.registerExecution(
+          testStatus != null ? testStatus : TestStatus.skip, test.getDuration(endTime));
 
       if (testExecutionHistory.hasFailedAllRetries()) {
         test.setTag(Tags.TEST_HAS_FAILED_ALL_RETRIES, true);