diff --git a/samples/.classpath b/samples/.classpath
index c7aaa6fdf..65de75cb7 100644
--- a/samples/.classpath
+++ b/samples/.classpath
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="src" output="bin/test-classes" path="src/test/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry kind="src" output="bin/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/samples/src/main/resources/jobs/adhocLoopJob.xml b/samples/src/main/resources/jobs/adhocLoopJob.xml
index a64ebdd74..3aa30ab88 100644
--- a/samples/src/main/resources/jobs/adhocLoopJob.xml
+++ b/samples/src/main/resources/jobs/adhocLoopJob.xml
@@ -23,7 +23,7 @@
 			<bean parent="jobExecutor">
 				<property name="stepExecutorFactory">
 					<bean
-						class="org.springframework.batch.execution.step.DefaultStepExecutorFactory">
+						class="org.springframework.batch.execution.step.PrototypeBeanStepExecutorFactory">
 						<property name="stepExecutorName"
 							value="notifyingStepExecutor" />
 					</bean>
diff --git a/samples/src/main/resources/simple-container-definition.xml b/samples/src/main/resources/simple-container-definition.xml
index 00d969f84..a907e764d 100644
--- a/samples/src/main/resources/simple-container-definition.xml
+++ b/samples/src/main/resources/simple-container-definition.xml
@@ -37,7 +37,7 @@
 	<bean id="jobExecutor" class="org.springframework.batch.execution.job.DefaultJobExecutor">
 		<property name="jobRepository" ref="simpleJobRepository" />
 		<property name="stepExecutorFactory">
-			<bean class="org.springframework.batch.execution.step.DefaultStepExecutorFactory">
+			<bean class="org.springframework.batch.execution.step.PrototypeBeanStepExecutorFactory">
 				<property name="stepExecutorName" value="stepExecutor" />
 			</bean>
 		</property>
@@ -83,7 +83,7 @@
 		<property name="restartable" value="true" />
 	</bean>
 
-	<bean id="simpleStep" class="org.springframework.batch.execution.step.simple.SimpleStepConfiguration"
+	<bean id="simpleStep" class="org.springframework.batch.execution.step.SimpleStepConfiguration"
 		abstract="true">
 		<property name="allowStartIfComplete" value="true" />
 		<property name="saveRestartData" value="false" />