diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd
index 192d9f1f90..8ac91bd4ca 100644
--- a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd
+++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/spring-integration-jms-1.0.xsd
@@ -57,6 +57,7 @@
 					<xsd:attribute name="max-concurrent-consumers" type="xsd:string"/>
 					<xsd:attribute name="max-messages-per-task" type="xsd:string"/>
 					<xsd:attribute name="idle-task-execution-limit" type="xsd:string"/>
+					<xsd:attribute name="auto-startup" type="xsd:string" default="true"/>
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsInboundGatewayParserTests.java b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsInboundGatewayParserTests.java
index cc5d93d554..11ae0acd65 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsInboundGatewayParserTests.java
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsInboundGatewayParserTests.java
@@ -26,7 +26,7 @@ import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.channel.PollableChannel;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.jms.JmsInboundGateway;
 import org.springframework.jms.connection.JmsTransactionManager;
@@ -41,9 +41,9 @@ public class JmsInboundGatewayParserTests {
 	public void testGatewayWithConnectionFactoryAndDestination() {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				"jmsGatewayWithConnectionFactoryAndDestination.xml", this.getClass());
-		QueueChannel channel = new QueueChannel(1);
+		PollableChannel channel = (PollableChannel) context.getBean("requestChannel");
 		JmsInboundGateway gateway = (JmsInboundGateway) context.getBean("jmsGateway");
-		gateway.setRequestChannel(channel);
+		assertEquals(JmsInboundGateway.class, gateway.getClass());
 		context.start();
 		Message<?> message = channel.receive(3000);
 		assertNotNull("message should not be null", message);
@@ -55,9 +55,9 @@ public class JmsInboundGatewayParserTests {
 	public void testGatewayWithConnectionFactoryAndDestinationName() {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				"jmsGatewayWithConnectionFactoryAndDestinationName.xml", this.getClass());
-		QueueChannel channel = new QueueChannel(1);
+		PollableChannel channel = (PollableChannel) context.getBean("requestChannel");
 		JmsInboundGateway gateway = (JmsInboundGateway) context.getBean("jmsGateway");
-		gateway.setRequestChannel(channel);
+		assertEquals(JmsInboundGateway.class, gateway.getClass());
 		context.start();
 		Message<?> message = channel.receive(3000);
 		assertNotNull("message should not be null", message);
@@ -69,9 +69,9 @@ public class JmsInboundGatewayParserTests {
 	public void testGatewayWithMessageConverter() {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				"jmsGatewayWithMessageConverter.xml", this.getClass());
-		QueueChannel channel = new QueueChannel(1);
+		PollableChannel channel = (PollableChannel) context.getBean("requestChannel");
 		JmsInboundGateway gateway = (JmsInboundGateway) context.getBean("jmsGateway");
-		gateway.setRequestChannel(channel);
+		assertEquals(JmsInboundGateway.class, gateway.getClass());
 		context.start();
 		Message<?> message = channel.receive(3000);
 		assertNotNull("message should not be null", message);
@@ -132,9 +132,9 @@ public class JmsInboundGatewayParserTests {
 	public void testGatewayWithDefaultConnectionFactory() {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				"jmsGatewayWithDefaultConnectionFactory.xml", this.getClass());
-		QueueChannel channel = new QueueChannel(1);
+		PollableChannel channel = (PollableChannel) context.getBean("requestChannel");
 		JmsInboundGateway gateway = (JmsInboundGateway) context.getBean("jmsGateway");
-		gateway.setRequestChannel(channel);
+		assertEquals(JmsInboundGateway.class, gateway.getClass());
 		context.start();
 		Message<?> message = channel.receive(3000);
 		assertNotNull("message should not be null", message);
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayTransactionManagerTests.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayTransactionManagerTests.xml
index 09295856eb..8912ed6423 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayTransactionManagerTests.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayTransactionManagerTests.xml
@@ -10,7 +10,9 @@
 			http://www.springframework.org/schema/integration/jms
 			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd">
 
-	<si:channel id="requestChannel"/>
+	<si:channel id="requestChannel">
+		<si:queue/>
+	</si:channel>
 
 	<jms:inbound-gateway id="gatewayWithoutTransactionManager"
 	                     connection-factory="testConnectionFactory"
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml
index bf808e66b7..20a83a800f 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml
@@ -10,7 +10,9 @@
 			http://www.springframework.org/schema/integration/jms
 			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd">
 
-	<si:channel id="requestChannel"/>
+	<si:channel id="requestChannel">
+		<si:queue/>
+	</si:channel>
 
 	<jms:inbound-gateway id="jmsGateway"
 	                 	 connection-factory="testConnectionFactory"
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml
index 42913b0a8a..44539ff112 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml
@@ -10,7 +10,9 @@
 			http://www.springframework.org/schema/integration/jms
 			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd">
 
-	<si:channel id="requestChannel"/>
+	<si:channel id="requestChannel">
+		<si:queue/>
+	</si:channel>
 
 	<jms:inbound-gateway id="jmsGateway"
 	                     connection-factory="testConnectionFactory"
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryOnly.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryOnly.xml
index c84dd18b85..6d68e9878b 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryOnly.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryOnly.xml
@@ -10,7 +10,9 @@
 			http://www.springframework.org/schema/integration/jms
 			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd">
 
-	<si:channel id="requestChannel"/>
+	<si:channel id="requestChannel">
+		<si:queue/>
+	</si:channel>
 
 	<jms:inbound-gateway id="jmsGateway"
 					 	 connection-factory="testConnectionFactory"
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml
index 5bb3f658c6..1f6c50cc59 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml
@@ -10,7 +10,9 @@
 			http://www.springframework.org/schema/integration/jms
 			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd">
 
-	<si:channel id="requestChannel"/>
+	<si:channel id="requestChannel">
+		<si:queue/>
+	</si:channel>
 
 	<jms:inbound-gateway id="jmsGateway"
 					 	 destination-name="testDestinationName"
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithEmptyConnectionFactory.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithEmptyConnectionFactory.xml
index d65d92253d..8140bdf603 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithEmptyConnectionFactory.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithEmptyConnectionFactory.xml
@@ -10,7 +10,9 @@
 			http://www.springframework.org/schema/integration/jms
 			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd">
 
-	<si:channel id="requestChannel"/>
+	<si:channel id="requestChannel">
+		<si:queue/>
+	</si:channel>
 
 	<jms:inbound-gateway id="jmsGateway"
 					 	 connection-factory=""
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithMessageConverter.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithMessageConverter.xml
index 745c16e9dc..bb9b9b3cf4 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithMessageConverter.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithMessageConverter.xml
@@ -10,7 +10,9 @@
 			http://www.springframework.org/schema/integration/jms
 			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd">
 
-	<si:channel id="requestChannel"/>
+	<si:channel id="requestChannel">
+		<si:queue/>
+	</si:channel>
 
 	<jms:inbound-gateway id="jmsGateway"
 	                 	 connection-factory="testConnectionFactory"