diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnCompletedStepJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnCompletedStepJobParserTests.java
index b350f9620..bd6874ff6 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnCompletedStepJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnCompletedStepJobParserTests.java
@@ -16,7 +16,6 @@
 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;
@@ -44,22 +43,21 @@ public class StopRestartOnCompletedStepJobParserTests extends AbstractJobParserT
 		//
 		// First Launch
 		//
-		launchAndAssert();
+		launchAndAssert("[s0, s1]");
 
 		//
 		// Second Launch
 		//
 		stepNamesList.clear();
-		launchAndAssert();
+		launchAndAssert("[s1]");
 
 	}
 
-	private void launchAndAssert() throws JobInstanceAlreadyCompleteException, JobRestartException,
+	private void launchAndAssert(String stepNames) throws JobInstanceAlreadyCompleteException, JobRestartException,
 			JobExecutionAlreadyRunningException {
 		JobExecution jobExecution = createJobExecution();
 		job.execute(jobExecution);
-		assertEquals(1, stepNamesList.size());
-		assertTrue(stepNamesList.contains("s1"));
+		assertEquals(stepNames, stepNamesList.toString());
 
 		assertEquals(BatchStatus.STOPPED, jobExecution.getStatus());
 		assertEquals(ExitStatus.STOPPED.getExitCode(), jobExecution.getExitStatus().getExitCode());
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnFailedStepJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnFailedStepJobParserTests.java
index e53b962dd..70fb3d694 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnFailedStepJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnFailedStepJobParserTests.java
@@ -16,7 +16,6 @@
 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;
@@ -44,22 +43,21 @@ public class StopRestartOnFailedStepJobParserTests extends AbstractJobParserTest
 		//
 		// First Launch
 		//
-		launchAndAssert();
+		launchAndAssert("[s0, fail]");
 
 		//
 		// Second Launch
 		//
 		stepNamesList.clear();
-		launchAndAssert();
+		launchAndAssert("[fail]");
 
 	}
 
-	private void launchAndAssert() throws JobInstanceAlreadyCompleteException, JobRestartException,
+	private void launchAndAssert(String stepNames) throws JobInstanceAlreadyCompleteException, JobRestartException,
 			JobExecutionAlreadyRunningException {
 		JobExecution jobExecution = createJobExecution();
 		job.execute(jobExecution);
-		assertEquals(1, stepNamesList.size());
-		assertTrue(stepNamesList.contains("fail"));
+		assertEquals(stepNames, stepNamesList.toString());
 
 		assertEquals(BatchStatus.STOPPED, jobExecution.getStatus());
 		assertEquals(ExitStatus.STOPPED.getExitCode(), jobExecution.getExitStatus().getExitCode());
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopRestartOnCompletedStepJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopRestartOnCompletedStepJobParserTests-context.xml
index 6082ff81c..0b13bf574 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopRestartOnCompletedStepJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopRestartOnCompletedStepJobParserTests-context.xml
@@ -7,6 +7,7 @@
 	<beans:import resource="common-context.xml" />
 	
 	<job id="job">
+		<step id="s0" ref="step2" next="s1"/>
 		<step id="s1" ref="taskletStep">
 			<!-- On normal step status: stop the job, but restart with the same step. -->
 			<stop on="COMPLETED" restart="s1"/>
@@ -14,9 +15,8 @@
 		</step>
 	</job>
 
-	<beans:bean id="taskletStep" parent="step1">
-		<!-- On restart this step will be re-executed: effect is infinitely re-runnable job --> 
-		<beans:property name="allowStartIfComplete" value="true"/>
-	</beans:bean>
+	<!-- On restart this step will be re-executed: effect is infinitely re-runnable job -->
+	<step id="taskletStep" parent="step1" allow-start-if-complete="true"/>
+
 
 </beans:beans>
\ No newline at end of file
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopRestartOnFailedStepJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopRestartOnFailedStepJobParserTests-context.xml
index 3340f9503..faf519718 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopRestartOnFailedStepJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopRestartOnFailedStepJobParserTests-context.xml
@@ -7,6 +7,7 @@
 	<beans:import resource="common-context.xml" />
 	
 	<job id="job">
+		<step id="s0" ref="step2" next="fail"/>
 		<step id="fail" ref="taskletStep">
 			<!-- On failure: stop the job, but restart with the same step. -->
 			<stop on="FAILED" restart="fail"/>
@@ -14,9 +15,7 @@
 		</step>
 	</job>
 
-	<beans:bean id="taskletStep" parent="failingStep">
-		<!-- On restart this step will be re-executed: effect is infinitely re-runnable job --> 
-		<beans:property name="allowStartIfComplete" value="true"/>
-	</beans:bean>
-
+	<!-- On restart this step will be re-executed: effect is infinitely re-runnable job -->
+	<step id="taskletStep" parent="failingStep" allow-start-if-complete="true"/>
+ 
 </beans:beans>
\ No newline at end of file