diff --git a/org.springframework.integration.samples/scripts/cafeDemo.xml b/org.springframework.integration.samples/scripts/cafeDemo.xml
index 5ea6223f2e..51ad040307 100644
--- a/org.springframework.integration.samples/scripts/cafeDemo.xml
+++ b/org.springframework.integration.samples/scripts/cafeDemo.xml
@@ -10,8 +10,6 @@
 			http://www.springframework.org/schema/integration/stream
 			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
 
-	<message-bus/>
-
 	<gateway id="cafe" service-interface="org.springframework.integration.samples.cafe.Cafe"/>
 
 	<channel id="orders"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java
index 4d581fac71..418952bea2 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/MessageBusParserTests.java
@@ -27,6 +27,8 @@ import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.core.task.SyncTaskExecutor;
 import org.springframework.integration.channel.BeanFactoryChannelResolver;
+import org.springframework.integration.context.IntegrationContextUtils;
+import org.springframework.integration.scheduling.TaskScheduler;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 /**
@@ -86,4 +88,20 @@ public class MessageBusParserTests {
 		assertEquals(ThreadPoolTaskExecutor.class, taskExecutor.getClass());
 	}
 
+	@Test
+	public void testExplicitlyDefinedTaskSchedulerHasCorrectType() {
+		AbstractApplicationContext context = new ClassPathXmlApplicationContext(
+				"messageBusWithTaskScheduler.xml", this.getClass());
+		TaskScheduler scheduler = (TaskScheduler) context.getBean("taskScheduler");
+		assertEquals(StubTaskScheduler.class, scheduler.getClass());
+	}
+
+	@Test
+	public void testExplicitlyDefinedTaskSchedulerMatchesUtilLookup() {
+		AbstractApplicationContext context = new ClassPathXmlApplicationContext(
+				"messageBusWithTaskScheduler.xml", this.getClass());
+		TaskScheduler scheduler = (TaskScheduler) context.getBean("taskScheduler");
+		assertEquals(scheduler, IntegrationContextUtils.getTaskScheduler(context));
+	}
+
 }
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithListener.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithListener.xml
deleted file mode 100644
index 336bfcc3df..0000000000
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithListener.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
-
-	<message-bus auto-startup="false"/>
-
-	<beans:bean id="listener" class="org.springframework.integration.bus.MessageBusEventTests$TestMessageBusEventListener"/>
-
-</beans:beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithTaskScheduler.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithTaskScheduler.xml
index e0ea8c1c91..88a46d15a4 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithTaskScheduler.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithTaskScheduler.xml
@@ -7,8 +7,8 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus task-scheduler="testScheduler"/>
+	<channel id="test"/>
 
-	<beans:bean id="testScheduler" class="org.springframework.integration.config.StubTaskScheduler"/>
+	<beans:bean id="taskScheduler" class="org.springframework.integration.config.StubTaskScheduler"/>
 
 </beans:beans>