diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapStepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapStepExecutionDao.java
index 7813b96d0..5dcacba70 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapStepExecutionDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapStepExecutionDao.java
@@ -44,6 +44,7 @@ public class MapStepExecutionDao implements StepExecutionDao {
 
 	public static void clear() {
 		executionsByJobExecutionId.clear();
+		contextsByStepExecutionId.clear();
 	}
 
 	public ExecutionContext findExecutionContext(StepExecution stepExecution) {