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 a9a34350b1..dc69b70e1e 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
@@ -114,7 +114,10 @@ public class ChannelTests extends LogAdjustingTestSupport {
 
 	@After
 	public void tearDown() {
-		new RabbitAdmin(this.factory).deleteExchange("si.fanout.foo");
+		RabbitAdmin rabbitAdmin = new RabbitAdmin(this.factory);
+		rabbitAdmin.deleteExchange("si.fanout.foo");
+		rabbitAdmin.deleteExchange("si.fanout.channel");
+		rabbitAdmin.deleteExchange("si.fanout.pubSubWithEP");
 		brokerIsRunning.removeTestQueues();
 	}