diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java
new file mode 100644
index 000000000..04c2b9780
--- /dev/null
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java
@@ -0,0 +1,58 @@
+/*
+ * 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.sample;
+
+import org.springframework.batch.core.domain.BatchStatus;
+import org.springframework.batch.core.domain.JobExecution;
+import org.springframework.batch.core.domain.JobParameters;
+
+/**
+ * Functional test for graceful shutdown.  A batch container is started in a new thread,
+ * then it's stopped via the Lifecycle interface.  
+ * 
+ * @author Lucas Ward
+ *
+ */
+public class GracefulShutdownFunctionalTests extends AbstractBatchLauncherTests {
+
+	protected String[] getConfigLocations(){
+		return new String[] {"jobs/infiniteLoopJob.xml"};
+	}
+
+	public void testLaunchJob() throws Exception {
+
+		final JobParameters jobParameters = new JobParameters();
+		
+		JobExecution jobExecution = launcher.run(getJob(), jobParameters);
+		
+		Thread.sleep(200);
+
+		assertEquals(BatchStatus.STARTED, jobExecution.getStatus());
+		assertTrue(jobExecution.isRunning());
+
+		jobExecution.stop();
+		
+		int count = 0;
+		while(jobExecution.isRunning() && count <= 10){
+			Thread.sleep(10);
+		}
+		
+		assertFalse(jobExecution.isRunning());
+
+	}
+	
+}