diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java b/spring-integration-samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java
index 2615161ef9..60053ea54e 100644
--- a/spring-integration-samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java
+++ b/spring-integration-samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java
@@ -38,6 +38,7 @@ public class HelloWorldDemo {
 		MessageChannel outputChannel = channelRegistry.lookupChannel("outputChannel");
 		inputChannel.send(new StringMessage(1, "World"));
 		System.out.println(outputChannel.receive().getPayload());
+		context.stop();
 	}
 
 }
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/oddeven/OddEvenDemo.java b/spring-integration-samples/src/main/java/org/springframework/integration/samples/oddeven/OddEvenDemo.java
index a490f5f71c..e7e30eda61 100644
--- a/spring-integration-samples/src/main/java/org/springframework/integration/samples/oddeven/OddEvenDemo.java
+++ b/spring-integration-samples/src/main/java/org/springframework/integration/samples/oddeven/OddEvenDemo.java
@@ -24,10 +24,9 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
  */
 public class OddEvenDemo {
 
-	public static void main(String[] args) throws Exception {
+	public static void main(String[] args) {
 		AbstractApplicationContext context = new ClassPathXmlApplicationContext("oddEvenDemo.xml", OddEvenDemo.class);
 		context.start();
-		System.in.read();
 	}
 
 }
diff --git a/spring-integration-samples/src/main/java/org/springframework/integration/samples/quote/QuoteDemo.java b/spring-integration-samples/src/main/java/org/springframework/integration/samples/quote/QuoteDemo.java
index e48bd03bd5..09879c8711 100644
--- a/spring-integration-samples/src/main/java/org/springframework/integration/samples/quote/QuoteDemo.java
+++ b/spring-integration-samples/src/main/java/org/springframework/integration/samples/quote/QuoteDemo.java
@@ -24,9 +24,8 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
  */
 public class QuoteDemo {
 
-	public static void main(String[] args) throws Exception {
+	public static void main(String[] args) {
 		AbstractApplicationContext context = new ClassPathXmlApplicationContext("quoteDemo.xml", QuoteDemo.class);
 		context.start();
-		System.in.read();
 	}
 }