diff --git a/samples/src/main/resources/jobs/infiniteLoopJob.xml b/samples/src/main/resources/jobs/infiniteLoopJob.xml
index f066e14ad..f08ce06d5 100644
--- a/samples/src/main/resources/jobs/infiniteLoopJob.xml
+++ b/samples/src/main/resources/jobs/infiniteLoopJob.xml
@@ -11,7 +11,20 @@
 
 	<bean class="org.springframework.batch.execution.configuration.JobConfigurationRegistryBeanPostProcessor">
 		<property name="jobConfigurationRegistry" ref="jobConfigurationRegistry"/>
-	</bean>
+	</bean>
+	
+	<!-- Override the default jobExecutorFacade to provide a listener that can interrupt the job -->
+	<bean id="jobExecutorFacade" class="org.springframework.batch.execution.facade.SimpleJobExecutorFacade">
+		<property name="jobRepository" ref="simpleJobRepository" />
+		<property name="jobConfigurationLocator" ref="jobConfigurationRegistry"/>
+		<property name="jobExecutor" ref="jobExecutor" />
+		<property name="jobExecutionListeners">
+			<list>
+				<bean class="org.springframework.batch.execution.bootstrap.support.ThreadInterruptJobExecutionListener"/>
+			</list>
+		</property>
+	</bean>
+	
 
 	<bean id="jobConfiguration" parent="simpleJob">
 		<property name="steps">
diff --git a/samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java b/samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java
index 1a3957545..2ed136e3f 100644
--- a/samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java
+++ b/samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java
@@ -32,8 +32,8 @@ public abstract class AbstractBatchLauncherTests extends AbstractDependencyInjec
 	protected ConfigurableApplicationContext createApplicationContext(
 			String[] locations) {
 		String[] allLocations = new String[locations.length+1];
-		System.arraycopy(locations, 0, allLocations, 0, locations.length);
-		allLocations[locations.length] = "simple-container-definition.xml";
+		System.arraycopy(locations, 0, allLocations, 1, locations.length);
+		allLocations[0] = "simple-container-definition.xml";
 		return super.createApplicationContext(allLocations);
 	}