diff --git a/serenity-core/src/main/java/net/thucydides/core/steps/BaseStepListener.java b/serenity-core/src/main/java/net/thucydides/core/steps/BaseStepListener.java
index 2dc3b2f23..7dd9e0c9a 100644
--- a/serenity-core/src/main/java/net/thucydides/core/steps/BaseStepListener.java
+++ b/serenity-core/src/main/java/net/thucydides/core/steps/BaseStepListener.java
@@ -924,15 +924,9 @@ public void stepFailed(StepFailure failure, List<ScreenshotAndHtmlSource> screen
             getCurrentTestOutcome().appendTestFailure(failureCause);
 
             recordFailureDetails(failure);
-            // Step marked as done with the appropriate result before
-            if (isInDataDrivenTest) {
-                currentStepDone(failureAnalysis.resultFor(failure));
-            }
-        }
-        if (!isInDataDrivenTest) {
-            // Step marked as done with the appropriate result before
-            currentStepDone(failureAnalysis.resultFor(failure));
         }
+        // Step marked as done with the appropriate result before
+        currentStepDone(failureAnalysis.resultFor(failure));
     }