diff --git a/spring-batch-core/.springBeans b/spring-batch-core/.springBeans
index 681fc42dc..8777342d8 100644
--- a/spring-batch-core/.springBeans
+++ b/spring-batch-core/.springBeans
@@ -60,6 +60,7 @@
 		<config>src/test/resources/org/springframework/batch/core/configuration/xml/StopRestartOnFailedStepJobParserTests-context.xml</config>
 		<config>src/test/resources/org/springframework/batch/core/configuration/xml/JobRegistryJobParserTests-context.xml</config>
 		<config>src/test/resources/org/springframework/batch/core/launch/JobLauncherIntegrationTests-context.xml</config>
+		<config>src/test/resources/org/springframework/batch/core/configuration/xml/StopCustomStatusJobParserTests-context.xml</config>
 	</configs>
 	<configSets>
 		<configSet>
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopCustomStatusJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopCustomStatusJobParserTests.java
new file mode 100644
index 000000000..1f6172552
--- /dev/null
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopCustomStatusJobParserTests.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2006-2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.batch.core.configuration.xml;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.batch.core.BatchStatus;
+import org.springframework.batch.core.ExitStatus;
+import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.StepExecution;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Dave Syer
+ * 
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class StopCustomStatusJobParserTests extends AbstractJobParserTests {
+
+	@Test
+	public void testStopCustomStatus() throws Exception {
+
+		//
+		// First Launch
+		//
+		JobExecution jobExecution = createJobExecution();
+		job.execute(jobExecution);
+		assertTrue("Wrong steps executed: "+stepNamesList, stepNamesList.contains("stop"));
+		assertEquals(1, stepNamesList.size());
+
+		assertEquals(BatchStatus.STOPPED, jobExecution.getStatus());
+		assertEquals(ExitStatus.STOPPED.getExitCode(), jobExecution.getExitStatus().getExitCode());
+
+		StepExecution stepExecution1 = getStepExecution(jobExecution, "stop");
+		assertEquals(BatchStatus.COMPLETED, stepExecution1.getStatus());
+		assertEquals("FOO", stepExecution1.getExitStatus().getExitCode());
+
+		//
+		// Second Launch
+		//
+		stepNamesList.clear();
+		jobExecution = createJobExecution();
+		job.execute(jobExecution);
+		assertTrue("Wrong steps executed: "+stepNamesList, stepNamesList.contains("s2"));
+		assertEquals(1, stepNamesList.size()); // step1 is not executed
+
+		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
+		assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
+
+		StepExecution stepExecution2 = getStepExecution(jobExecution, "s2");
+		assertEquals(BatchStatus.COMPLETED, stepExecution2.getStatus());
+		assertEquals(ExitStatus.COMPLETED, stepExecution2.getExitStatus());
+
+	}
+
+}
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestCustomStatusListener.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestCustomStatusListener.java
new file mode 100644
index 000000000..0564cfd81
--- /dev/null
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestCustomStatusListener.java
@@ -0,0 +1,17 @@
+package org.springframework.batch.core.configuration.xml;
+
+import org.springframework.batch.core.ExitStatus;
+import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.StepExecutionListener;
+
+public class TestCustomStatusListener extends AbstractTestComponent implements StepExecutionListener {
+
+	public ExitStatus afterStep(StepExecution stepExecution) {
+		return new ExitStatus("FOO").and(stepExecution.getExitStatus());
+	}
+
+	public void beforeStep(StepExecution stepExecution) {
+		executed = true;
+	}
+	
+}
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestListener.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestListener.java
index 0b34198f9..089d9864b 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestListener.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestListener.java
@@ -15,10 +15,6 @@ public class TestListener extends AbstractTestComponent implements StepExecution
 		executed = true;
 	}
 	
-	public void destroy(){
-		
-	}
-	
 	@AfterRead
 	public void logItem(){
 		
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopCustomStatusJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopCustomStatusJobParserTests-context.xml
new file mode 100644
index 000000000..9396861bd
--- /dev/null
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopCustomStatusJobParserTests-context.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/batch"
+	xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.0.xsd
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<beans:import resource="common-context.xml" />
+
+	<job id="job">
+		<step id="stop">
+			<tasklet ref="nameStoringTasklet">
+				<listeners>
+					<listener
+						class="org.springframework.batch.core.configuration.xml.TestCustomStatusListener" />
+				</listeners>
+			</tasklet>
+			<stop on="FOO" restart="s2" />
+			<end on="*"/>
+		</step>
+		<step id="s2" parent="step2" />
+	</job>
+
+</beans:beans>
\ No newline at end of file