diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateItemWriterTests.java
index 24f4287c6..dff648d84 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateItemWriterTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateItemWriterTests.java
@@ -22,10 +22,8 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.batch.repeat.support.RepeatSynchronizationManager;
 import org.springframework.orm.hibernate3.HibernateOperations;
 
 /**
@@ -45,11 +43,6 @@ public class HibernateItemWriterTests {
 		writer.setHibernateTemplate(ht);
 	}
 
-	@After
-	public void tearDown() throws Exception {
-		RepeatSynchronizationManager.clear();
-	}
-
 	/**
 	 * Test method for
 	 * {@link org.springframework.batch.item.database.HibernateItemWriter#afterPropertiesSet()}
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterClassicTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterClassicTests.java
index 2962c8b6a..cb7ef1d46 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterClassicTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterClassicTests.java
@@ -24,10 +24,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.batch.repeat.support.RepeatSynchronizationManager;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.UncategorizedSQLException;
@@ -49,11 +47,6 @@ public class JdbcBatchItemWriterClassicTests {
 
 	private PreparedStatement ps;
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see junit.framework.TestCase#setUp()
-	 */
 	@Before
 	public void setUp() throws Exception {
 		ps = createMock(PreparedStatement.class);
@@ -78,15 +71,10 @@ public class JdbcBatchItemWriterClassicTests {
 		writer.afterPropertiesSet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	@After
-	public void tearDown() throws Exception {
-		RepeatSynchronizationManager.clear();
-	}
+//	@After
+//	public void tearDown() throws Exception {
+//		RepeatSynchronizationManager.clear();
+//	}
 
 	/**
 	 * Test method for
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterNamedParameterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterNamedParameterTests.java
index dacd4da50..d55a423c0 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterNamedParameterTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterNamedParameterTests.java
@@ -69,11 +69,6 @@ public class JdbcBatchItemWriterNamedParameterTests {
 		
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see junit.framework.TestCase#setUp()
-	 */
 	@Before
 	public void setUp() throws Exception {
 		sjt = createMock(SimpleJdbcOperations.class);
@@ -84,16 +79,6 @@ public class JdbcBatchItemWriterNamedParameterTests {
 		writer.afterPropertiesSet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	@After
-	public void tearDown() throws Exception {
-		RepeatSynchronizationManager.clear();
-	}
-
 	/**
 	 * Test method for
 	 * {@link org.springframework.batch.item.database.JdbcBatchItemWriter#afterPropertiesSet()}