diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml
index 104dfc7fa..d98df5530 100644
--- a/spring-batch-samples/pom.xml
+++ b/spring-batch-samples/pom.xml
@@ -20,7 +20,7 @@
 			<dependency>
 				<groupId>com.vmware.sqlfire</groupId>
 				<artifactId>sqlfireclient</artifactId>
-				<version>1.0.3</version>
+				<optional>true</optional>
 			</dependency>
 		<dependency>
 			<groupId>org.springframework.batch</groupId>
diff --git a/spring-batch-samples/src/main/resources/jobs/amqp-example-job.xml b/spring-batch-samples/src/main/resources/jobs/amqp-example-job.xml
index 3c5b7ffdc..b8dba281c 100644
--- a/spring-batch-samples/src/main/resources/jobs/amqp-example-job.xml
+++ b/spring-batch-samples/src/main/resources/jobs/amqp-example-job.xml
@@ -9,7 +9,6 @@
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
     <beans:import resource="classpath:/META-INF/spring/config-beans.xml"/>
-<!--  <beans:import resource="classpath:/META-INF/spring/batch-beans.xml"/>  -->   
     <beans:import resource="classpath:/META-INF/spring/jobs/messaging/rabbitmq-beans.xml"/>
     <beans:import resource="classpath:/META-INF/spring/jobs/amqp/amqp-example-job-beans.xml"/>
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/AMQPJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AMQPJobFunctionalTests.java
index 773a8eeb1..c1a10af1c 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/AMQPJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AMQPJobFunctionalTests.java
@@ -2,18 +2,15 @@ package org.springframework.batch.sample;
 
 import static org.junit.Assert.assertTrue;
 
-import javax.sql.DataSource;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.batch.core.explore.JobExplorer;
 import org.springframework.batch.test.JobLauncherTestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-/** 
+/**
  * Run the job to read from the "test.inbound" queue, process the messages and write them to the "test.outbound" queue:
  * mvn -q exec:java -Dexec.mainClass="org.springframework.batch.core.launch.support.CommandLineJobRunner" \
  *    -Dexec.arguments="classpath*:/META-INF/spring/jobs/amqp/amqp-example-job.xml,amqp-example-job"
@@ -25,21 +22,14 @@ public class AMQPJobFunctionalTests {
 
 	@Autowired
 	private JobLauncherTestUtils jobLauncherTestUtils;
-	private SimpleJdbcTemplate simpleJdbcTemplate;
 	@Autowired
 	private JobExplorer jobExplorer;
-	
-	@Autowired
-	public void setDataSource(DataSource dataSource) {
-		this.simpleJdbcTemplate = new SimpleJdbcTemplate(dataSource);
-	}
-
 
 	@Test
 	public void testLaunchJob() throws Exception {
-		
+
 		jobLauncherTestUtils.launchJob();
-		
+
 		int count = jobExplorer.getJobInstances("amqp-example-job", 0, 1).size();
 
 		assertTrue(count > 0);