diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
index 1c6efec330..520b04946b 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
@@ -13,8 +13,7 @@
 			http://www.springframework.org/schema/integration/stream
 			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
 
-	<message-bus/>
-	<annotation-driven/>
+	<message-bus enable-annotations="true"/>
 
 	<context:component-scan base-package="org.springframework.integration.samples.cafe.annotation"/>
 
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java
index 1f56d3157d..a80000f422 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldDemo.java
@@ -38,6 +38,7 @@ public class HelloWorldDemo {
 		PollableChannel outputChannel = (PollableChannel) channelRegistry.lookupChannel("outputChannel");
 		inputChannel.send(new StringMessage("World"));
 		System.out.println(outputChannel.receive().getPayload());
+		context.stop();
 	}
 
 }
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
index a0dfca7574..d00459a8a4 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
@@ -7,8 +7,7 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-	<annotation-driven/>
+	<message-bus enable-annotations="true"/>
 
 	<channel id="even"/>
 	<channel id="odd"/>
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
index 68b04153e8..e741271e49 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
@@ -7,8 +7,7 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-	<annotation-driven/>
+	<message-bus enable-annotations="true"/>
 
 	<channel id="even"/>
 	<channel id="odd"/>
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml
index 0232714575..2aa7dff7ab 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml
@@ -10,9 +10,7 @@
 			http://www.springframework.org/schema/integration/stream
 			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
 
-	<message-bus/>
-
-	<annotation-driven/>
+	<message-bus enable-annotations="true"/>
 
 	<beans:bean class="org.springframework.integration.samples.quote.TickerStream"/>