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 0d59b8d301..78e55925a0 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
@@ -29,6 +29,7 @@ import static org.mockito.Mockito.mock;
 
 import java.util.Collection;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CyclicBarrier;
 import java.util.concurrent.TimeUnit;
 
@@ -137,8 +138,8 @@ public class ChannelTests extends LogAdjustingTestSupport {
 		this.channel.send(new GenericMessage<String>("foo"));
 		latch.await(10, TimeUnit.SECONDS);
 		latch.reset();
-		BlockingQueueConsumer consumer = (BlockingQueueConsumer) TestUtils
-				.getPropertyValue(this.channel, "container.consumers", Map.class).keySet().iterator().next();
+		BlockingQueueConsumer consumer = (BlockingQueueConsumer) TestUtils.getPropertyValue(this.channel,
+				"container.consumers", Set.class).iterator().next();
 		factory.destroy();
 		waitForNewConsumer(this.channel, consumer);
 		this.channel.send(new GenericMessage<String>("bar"));
@@ -150,15 +151,15 @@ public class ChannelTests extends LogAdjustingTestSupport {
 
 	private void waitForNewConsumer(PublishSubscribeAmqpChannel channel, BlockingQueueConsumer consumer)
 			throws Exception {
-		BlockingQueueConsumer newConsumer = (BlockingQueueConsumer) TestUtils
-				.getPropertyValue(channel, "container.consumers", Map.class).keySet().iterator().next();
+		BlockingQueueConsumer newConsumer = (BlockingQueueConsumer) TestUtils.getPropertyValue(channel,
+				"container.consumers", Set.class).iterator().next();
 		int n = 0;
 		boolean newConsumerIsConsuming = newConsumer != consumer && TestUtils.getPropertyValue(newConsumer,
 				"consumerTags", Map.class).size() > 0;
 		while (n++ < 100 && !newConsumerIsConsuming) {
 			Thread.sleep(100);
-			newConsumer = (BlockingQueueConsumer) TestUtils
-					.getPropertyValue(channel, "container.consumers", Map.class).keySet().iterator().next();
+			newConsumer = (BlockingQueueConsumer) TestUtils.getPropertyValue(channel,
+					"container.consumers", Set.class).iterator().next();
 			newConsumerIsConsuming = newConsumer != consumer && TestUtils.getPropertyValue(newConsumer,
 					"consumerTags", Map.class).size() > 0;
 		}