diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParserTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParserTests.java
index da43cf4eca..3a400e8c1e 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParserTests.java
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParserTests.java
@@ -53,6 +53,7 @@ public class JmsInboundChannelAdapterParserTests {
 		assertEquals("jms:inbound-channel-adapter", componentHistoryRecord.get("type"));
 		assertNotNull("message should not be null", message);
 		assertEquals("polling-test", message.getPayload());
+		context.stop();
 	}
 	
 	@Test
@@ -62,6 +63,7 @@ public class JmsInboundChannelAdapterParserTests {
 		JmsTemplate jmsTemplate = 
 			TestUtils.getPropertyValue(context.getBean("inboundAdapterWithoutJmsTemplate"), "source.jmsTemplate", JmsTemplate.class);
 		assertEquals(0, jmsTemplate.getSessionAcknowledgeMode());
+		context.stop();
 	}
 
 	@Test
@@ -127,6 +129,7 @@ public class JmsInboundChannelAdapterParserTests {
 		Message<?> message = output.receive(timeoutOnReceive);
 		assertNotNull("message should not be null", message);
 		assertEquals("polling-test", message.getPayload());
+		context.stop();
 	}
 
 	@Test
@@ -139,6 +142,7 @@ public class JmsInboundChannelAdapterParserTests {
 		assertEquals("polling-test", message.getPayload());
 		assertEquals("foo", message.getHeaders().get("testProperty"));
 		assertEquals(new Integer(123), message.getHeaders().get("testAttribute"));
+		context.stop();
 	}
 
 	@Test
@@ -149,6 +153,7 @@ public class JmsInboundChannelAdapterParserTests {
 		Message<?> message = output.receive(timeoutOnReceive);
 		assertNotNull("message should not be null", message);
 		assertEquals("test [with selector: TestProperty = 'foo']", message.getPayload());
+		context.stop();
 	}
 
 	@Test
@@ -168,6 +173,7 @@ public class JmsInboundChannelAdapterParserTests {
 		Message<?> message = output.receive(timeoutOnReceive);
 		assertNotNull("message should not be null", message);
 		assertEquals("converted-test", message.getPayload());
+		context.stop();
 	}
 
 	@Test
@@ -178,6 +184,7 @@ public class JmsInboundChannelAdapterParserTests {
 		Message<?> message = output.receive(timeoutOnReceive);
 		assertNotNull("message should not be null", message);
 		assertEquals("converted-test", message.getPayload());
+		context.stop();
 	}
 
 }
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageDrivenChannelAdapterParserTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageDrivenChannelAdapterParserTests.java
index b610b8af0a..f7a172af13 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageDrivenChannelAdapterParserTests.java
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageDrivenChannelAdapterParserTests.java
@@ -51,11 +51,11 @@ public class JmsMessageDrivenChannelAdapterParserTests {
 		assertNotNull(history);
 		Properties componentHistoryRecord = TestUtils.locateComponentInHistory(history, "messageDrivenAdapter", 0);
 		assertNotNull(componentHistoryRecord);
-		JmsMessageDrivenEndpoint o =  context.getBean("messageDrivenAdapter", JmsMessageDrivenEndpoint.class);
-		System.out.println(o.getComponentType());
+		JmsMessageDrivenEndpoint endpoint =  context.getBean("messageDrivenAdapter", JmsMessageDrivenEndpoint.class);
 		assertEquals("jms:message-driven-channel-adapter", componentHistoryRecord.get("type"));
 		assertNotNull("message should not be null", message);
 		assertEquals("test [with selector: TestProperty = 'foo']", message.getPayload());
+		endpoint.stop();
 	}
 
 	@Test
@@ -65,6 +65,7 @@ public class JmsMessageDrivenChannelAdapterParserTests {
 		JmsMessageDrivenEndpoint endpoint = context.getBean("messageDrivenAdapter", JmsMessageDrivenEndpoint.class);
 		JmsDestinationAccessor container = (JmsDestinationAccessor) new DirectFieldAccessor(endpoint).getPropertyValue("listenerContainer");
 		assertEquals(Boolean.TRUE, container.isPubSubDomain());
+		endpoint.stop();
 	}
 
 	@Test
@@ -77,6 +78,7 @@ public class JmsMessageDrivenChannelAdapterParserTests {
 		assertEquals(Boolean.TRUE, container.isSubscriptionDurable());
 		assertEquals("testDurableSubscriptionName", container.getDurableSubscriptionName());
 		assertEquals("testClientId", container.getClientId());
+		endpoint.stop();
 	}
 
 	@Test
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithContainerSettings.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithContainerSettings.xml
index 7c65299df3..602f94243d 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithContainerSettings.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithContainerSettings.xml
@@ -19,6 +19,7 @@
 		 			 	 request-channel="requestChannel"
 		 			 	 request-destination-name="testQueue"
 		 			 	 request-pub-sub-domain="false"
+						 auto-startup="false"
 		 			 	 concurrent-consumers="3"/>
 
 	<jms:inbound-gateway id="gatewayWithMaxConcurrentConsumers"
@@ -26,6 +27,7 @@
 		 			 	 request-channel="requestChannel"
 		 			 	 request-destination-name="testTopic"
 		 			 	 request-pub-sub-domain="true"
+						 auto-startup="false"
 		 				 max-concurrent-consumers="22"/>
 
 	<jms:inbound-gateway id="gatewayWithMaxMessagesPerTask"
@@ -33,6 +35,7 @@
 		 			 	 request-channel="requestChannel"
 		 			 	 request-destination-name="testQueue"
 		 			 	 request-pub-sub-domain="false"
+						 auto-startup="false"
 		 			 	 max-messages-per-task="99"/>
 
 	<jms:inbound-gateway id="gatewayWithReceiveTimeout"
@@ -40,6 +43,7 @@
 		 		   	 	 request-channel="requestChannel"
 		 			 	 request-destination-name="testTopic"
 		 			 	 request-pub-sub-domain="true"
+						 auto-startup="false"
 		 				 receive-timeout="1111"/>
 
 	<jms:inbound-gateway id="gatewayWithRecoveryInterval"
@@ -47,6 +51,7 @@
 		 		   	 	 request-channel="requestChannel"
 		 			 	 request-destination-name="testTopic"
 		 			 	 request-pub-sub-domain="true"
+						 auto-startup="false"
 		 				 recovery-interval="2222"/>
 
 	<jms:inbound-gateway id="gatewayWithIdleTaskExecutionLimit"
@@ -54,6 +59,7 @@
 		 		   	 	 request-channel="requestChannel"
 		 			 	 request-destination-name="testTopic"
 		 			 	 request-pub-sub-domain="true"
+						 auto-startup="false"
 		 				 idle-task-execution-limit="7"/>
 
 	<jms:inbound-gateway id="gatewayWithIdleConsumerLimit"
@@ -61,6 +67,7 @@
 		 		   	 	 request-channel="requestChannel"
 		 			 	 request-destination-name="testTopic"
 		 			 	 request-pub-sub-domain="true"
+						 auto-startup="false"
 		 				 idle-consumer-limit="33"/>
 
 	<bean id="testConnectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithPubSubDomain.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithPubSubDomain.xml
index 6b095525db..6a07a9946f 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithPubSubDomain.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithPubSubDomain.xml
@@ -17,7 +17,8 @@
 	<jms:inbound-gateway id="gateway"
 			request-destination-name="testDestination"
 			request-pub-sub-domain="true"
-			request-channel="output"/>
+			request-channel="output"
+			auto-startup="false"/>
 
 	<bean id="connectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
 		<constructor-arg>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewaysWithExtractPayloadAttributes.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewaysWithExtractPayloadAttributes.xml
index 1dbff4cd55..3ab0b8d71f 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewaysWithExtractPayloadAttributes.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/jmsGatewaysWithExtractPayloadAttributes.xml
@@ -16,28 +16,33 @@
 
 	<jms:inbound-gateway id="defaultGateway"
 	                     request-destination="testDestination"
-	                     request-channel="requestChannel"/>
+	                     request-channel="requestChannel"
+	                     auto-startup="false"/>
 
 	<jms:inbound-gateway id="extractReplyPayloadTrue"
 	                     request-destination="testDestination"
 	                     request-channel="requestChannel"
-	                     extract-reply-payload="true"/>
+	                     extract-reply-payload="true"
+	                     auto-startup="false"/>
 
 	<jms:inbound-gateway id="extractReplyPayloadFalse"
 	                     request-destination="testDestination"
 	                     request-channel="requestChannel"
-	                     extract-reply-payload="false"/>
+	                     extract-reply-payload="false"
+	                     auto-startup="false"/>
 
 
 	<jms:inbound-gateway id="extractRequestPayloadTrue"
 	                     request-destination="testDestination"
 	                     request-channel="requestChannel"
-	                     extract-request-payload="true"/>
+	                     extract-request-payload="true"
+	                     auto-startup="false"/>
 
 	<jms:inbound-gateway id="extractRequestPayloadFalse"
 	                     request-destination="testDestination"
 	                     request-channel="requestChannel"
-	                     extract-request-payload="false"/>
+	                     extract-request-payload="false"
+	                     auto-startup="false"/>
 
 	<bean id="connectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
 		<constructor-arg>