diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeTests.java
index 0e97fe6f5..4bd8f8de7 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeTests.java
@@ -51,12 +51,13 @@ public class StepScopeTests {
 
 	@Before
 	public void setUp() throws Exception {
+		StepSynchronizationManager.release();
 		context = StepSynchronizationManager.register(stepExecution);
 	}
 
 	@After
 	public void tearDown() throws Exception {
-		StepSynchronizationManager.release();
+		StepSynchronizationManager.close();
 	}
 
 	@Test