diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/DefaultExceptionHandlerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/DefaultExceptionHandlerTests.java
index 40dc88c94..30ea5905e 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/DefaultExceptionHandlerTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/DefaultExceptionHandlerTests.java
@@ -19,8 +19,6 @@ package org.springframework.batch.repeat.exception;
 import junit.framework.TestCase;
 
 import org.springframework.batch.repeat.RepeatContext;
-import org.springframework.batch.repeat.RepeatException;
-import org.springframework.batch.repeat.exception.DefaultExceptionHandler;
 
 public class DefaultExceptionHandlerTests extends TestCase {
 
@@ -39,9 +37,9 @@ public class DefaultExceptionHandlerTests extends TestCase {
 	public void testError() throws Exception {
 		try {
 			handler.handleException(context, new Error("Foo"));
-			fail("Expected BatchException");
-		} catch (RepeatException e) {
-			assertEquals("Foo", e.getCause().getMessage());
+			fail("Expected Error");
+		} catch (Error e) {
+			assertEquals("Foo", e.getMessage());
 		}
 	}
 }
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandlerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandlerTests.java
index e430e12a4..b0bb3ba4e 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandlerTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandlerTests.java
@@ -25,8 +25,6 @@ import org.apache.log4j.Logger;
 import org.apache.log4j.SimpleLayout;
 import org.apache.log4j.WriterAppender;
 import org.springframework.batch.repeat.RepeatContext;
-import org.springframework.batch.repeat.RepeatException;
-import org.springframework.batch.repeat.exception.LogOrRethrowExceptionHandler;
 import org.springframework.batch.support.ExceptionClassifierSupport;
 
 public class LogOrRethrowExceptionHandlerTests extends TestCase {
@@ -57,9 +55,9 @@ public class LogOrRethrowExceptionHandlerTests extends TestCase {
 	public void testError() throws Exception {
 		try {
 			handler.handleException(context, new Error("Foo"));
-			fail("Expected BatchException");
-		} catch (RepeatException e) {
-			assertEquals("Foo", e.getCause().getMessage());
+			fail("Expected Error");
+		} catch (Error e) {
+			assertEquals("Foo", e.getMessage());
 		}
 	}
 	
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandlerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandlerTests.java
index deb2d3634..763e2430b 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandlerTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandlerTests.java
@@ -21,10 +21,8 @@ import java.util.Collections;
 import junit.framework.TestCase;
 
 import org.springframework.batch.repeat.RepeatContext;
-import org.springframework.batch.repeat.RepeatException;
 import org.springframework.batch.repeat.context.RepeatContextCounter;
 import org.springframework.batch.repeat.context.RepeatContextSupport;
-import org.springframework.batch.repeat.exception.RethrowOnThresholdExceptionHandler;
 import org.springframework.batch.support.ExceptionClassifierSupport;
 
 public class RethrowOnThresholdExceptionHandlerTests extends TestCase {
@@ -45,9 +43,9 @@ public class RethrowOnThresholdExceptionHandlerTests extends TestCase {
 	public void testError() throws Exception {
 		try {
 			handler.handleException(context, new Error("Foo"));
-			fail("Expected BatchException");
-		} catch (RepeatException e) {
-			assertEquals("Foo", e.getCause().getMessage());
+			fail("Expected Error");
+		} catch (Error e) {
+			assertEquals("Foo", e.getMessage());
 		}
 	}