diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/channel/ChannelTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/channel/ChannelTests.java
index 23415437d4..49cc3b153d 100644
--- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/channel/ChannelTests.java
+++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/channel/ChannelTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.integration.amqp.channel;
 
 import static org.junit.Assert.assertEquals;
@@ -27,7 +28,6 @@ import org.junit.runner.RunWith;
 
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.integration.amqp.rule.BrokerRunning;
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.messaging.Message;
@@ -55,9 +55,6 @@ public class ChannelTests {
 	@Autowired
 	private CachingConnectionFactory factory;
 
-	@Autowired
-	private ConfigurableApplicationContext context;
-
 	@Test
 	public void pubSubLostConnectionTest() throws Exception {
 		final CyclicBarrier latch = new CyclicBarrier(2);
@@ -78,7 +75,7 @@ public class ChannelTests {
 		factory.destroy();
 		channel.send(new GenericMessage<String>("bar"));
 		latch.await(10, TimeUnit.SECONDS);
-		context.close();
+		channel.destroy();
 		assertEquals(0, TestUtils.getPropertyValue(factory, "connectionListener.delegates", Collection.class).size());
 	}
 
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelParserTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelParserTests.java
index f1d349e471..04a7afbff8 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelParserTests.java
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,13 +28,11 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.Topic;
 
-import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.integration.jms.PollableJmsChannel;
 import org.springframework.integration.jms.SubscribableJmsChannel;
 import org.springframework.integration.support.MessageBuilderFactory;
@@ -47,6 +45,7 @@ import org.springframework.jms.support.destination.DestinationResolver;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.support.ChannelInterceptor;
 import org.springframework.messaging.support.ChannelInterceptorAdapter;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -56,6 +55,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
+@DirtiesContext
 public class JmsChannelParserTests {
 
 	@Autowired
@@ -115,18 +115,9 @@ public class JmsChannelParserTests {
 	@Autowired
 	private MessageChannel withContainerClass;
 
-	@Autowired
-	private AbstractApplicationContext context;
-
 	@Autowired
 	private MessageBuilderFactory messageBuilderFactory;
 
-
-	@After
-	public void closeContext() {
-		this.context.close();
-	}
-
 	@Test
 	public void queueReferenceChannel() {
 		assertEquals(SubscribableJmsChannel.class, queueReferenceChannel.getClass());
@@ -271,9 +262,9 @@ public class JmsChannelParserTests {
 	@Test
 	public void withPlaceholders() {
 		DefaultMessageListenerContainer container = TestUtils.getPropertyValue(withPlaceholders, "container", DefaultMessageListenerContainer.class);
-		System.out.println(container.getDestination());
-		System.out.println(container.getConcurrentConsumers());
-		System.out.println(container.getMaxConcurrentConsumers());
+		assertEquals("queue://test.queue", container.getDestination().toString());
+		assertEquals(5, container.getConcurrentConsumers());
+		assertEquals(25, container.getMaxConcurrentConsumers());
 	}
 
 	@Test