diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/InfiniteItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/InfiniteItemReader.java
deleted file mode 100644
index 5ab4c5c6b..000000000
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/InfiniteItemReader.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.springframework.batch.sample.item.reader;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.item.ItemReader;
-import org.springframework.batch.item.MarkFailedException;
-import org.springframework.batch.item.ResetFailedException;
-
-
-/**
- * Creates items infinitely - useful for testing job interruption by user.
- */
-public class InfiniteItemReader implements ItemReader {
-
-	private static final Log logger = LogFactory.getLog(InfiniteItemReader.class);
-	
-	private long counter = 0;
-	
-	public Object read() throws Exception {
-		Object item = "item" + counter;
-		Thread.sleep(10);
-		logger.info("read item: " + item);
-		return item;
-	}
-
-	public void mark() throws MarkFailedException {
-		// no-op
-		
-	}
-
-	public void reset() throws ResetFailedException {
-		// no-op
-		
-	}
-
-	
-
-}
diff --git a/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml b/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml
index 716446d52..b9c7ff978 100644
--- a/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml
@@ -25,7 +25,9 @@
 			</bean-->
 			<bean id="infiniteStep" parent="simpleStep">
 				<property name="itemReader">
-					<bean id="reader" class="org.springframework.batch.sample.item.reader.InfiniteItemReader" />
+					<bean id="reader" class="org.springframework.batch.sample.item.reader.GeneratingItemReader">
+						<property name="limit" value="1000000" />
+					</bean>
 				</property>
 				<property name="itemWriter">
 					<bean id="writer" class="org.springframework.batch.sample.item.writer.DummyItemWriter" />
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java
index b7c14830a..24f48dd75 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java
@@ -50,6 +50,7 @@ public class GracefulShutdownFunctionalTests extends AbstractBatchLauncherTests
 		}
 		
 		assertFalse("Timed out waiting for job to end.", jobExecution.isRunning());
+		assertEquals(BatchStatus.STOPPED, jobExecution.getStatus());
 
 	}