diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java
index 440c2da..847847d 100644
--- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java
+++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java
@@ -74,6 +74,7 @@ public class DownstreamExceptionTests {
 
 	@Test
 	public void testNoErrorChannel() throws Exception {
+		service.barrier.reset();
 		service.n = 0;
 		Log logger = spy(TestUtils.getPropertyValue(noErrorChannel, "logger", Log.class));
 		final  CountDownLatch latch = new CountDownLatch(1);
@@ -105,6 +106,7 @@ public class DownstreamExceptionTests {
 
 	@Test
 	public void testWithErrorChannel() throws Exception {
+		service.barrier.reset();
 		assertSame(this.errors, TestUtils.getPropertyValue(this.withErrorChannel, "errorChannel"));
 		service.n = 0;
 		MqttPahoMessageHandler adapter = new MqttPahoMessageHandler("tcp://localhost:1883", "si-test-out");
diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java~ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java~
deleted file mode 100644
index 4effd3f..0000000
--- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java~
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.integration.mqtt;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.contains;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.commons.logging.Log;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
-import org.springframework.beans.DirectFieldAccessor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.integration.mqtt.inbound.MqttPahoMessageDrivenChannelAdapter;
-import org.springframework.integration.mqtt.outbound.MqttPahoMessageHandler;
-import org.springframework.integration.test.util.TestUtils;
-import org.springframework.integration.channel.PollableChannel;
-import org.springframework.integration.message.GenericMessage;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-/**
- * @author Gary Russell
- * @since 4.0
- *
- */
-@ContextConfiguration
-@RunWith(SpringJUnit4ClassRunner.class)
-@DirtiesContext
-public class DownstreamExceptionTests {
-
-	@ClassRule
-	public static final BrokerRunning brokerRunning = BrokerRunning.isRunning(1883);
-
-	@Autowired
-	private Service service;
-
-	@Autowired
-	private MqttPahoMessageDrivenChannelAdapter noErrorChannel;
-
-	@Autowired
-	private MqttPahoMessageDrivenChannelAdapter withErrorChannel;
-
-	@Autowired
-	private PollableChannel errors;
-
-	@Test
-	public void testNoErrorChannel() throws Exception {
-		service.n = 0;
-		Log logger = spy(TestUtils.getPropertyValue(noErrorChannel, "logger", Log.class));
-		final  CountDownLatch latch = new CountDownLatch(1);
-		doAnswer(new Answer<Void>() {
-
-			@Override
-			public Void answer(InvocationOnMock invocation) throws Throwable {
-				if (((String) invocation.getArguments()[0]).contains("Unhandled")) {
-					latch.countDown();
-				}
-				return null;
-			}
-		}).when(logger).error(anyString(), any(Throwable.class));
-		new DirectFieldAccessor(noErrorChannel).setPropertyValue("logger", logger);
-		MqttPahoMessageHandler adapter = new MqttPahoMessageHandler("tcp://localhost:1883", "si-test-out");
-		adapter.setDefaultTopic("mqtt-fooEx1");
-		adapter.afterPropertiesSet();
-		adapter.start();
-		adapter.handleMessage(new GenericMessage<String>("foo"));
-		service.barrier.await(10, TimeUnit.SECONDS);
-		service.barrier.reset();
-		adapter.handleMessage(new GenericMessage<String>("foo"));
-		service.barrier.await(10, TimeUnit.SECONDS);
-		assertTrue(latch.await(10, TimeUnit.SECONDS));
-		verify(logger).error(contains("Unhandled exception for"), any(Throwable.class));
-		service.barrier.reset();
-		adapter.stop();
-	}
-
-	@Test
-	public void testWithErrorChannel() throws Exception {
-		assertSame(this.errors, TestUtils.getPropertyValue(this.withErrorChannel, "errorChannel"));
-		service.n = 0;
-		MqttPahoMessageHandler adapter = new MqttPahoMessageHandler("tcp://localhost:1883", "si-test-out");
-		adapter.setDefaultTopic("mqtt-fooEx2");
-		adapter.afterPropertiesSet();
-		adapter.start();
-		adapter.handleMessage(new GenericMessage<String>("foo"));
-		service.barrier.await(10, TimeUnit.SECONDS);
-		service.barrier.reset();
-		adapter.handleMessage(new GenericMessage<String>("foo"));
-		service.barrier.await(10, TimeUnit.SECONDS);
-		assertNotNull(errors.receive(10000));
-		service.barrier.reset();
-		adapter.stop();
-	}
-
-	public static class Service {
-
-		public CyclicBarrier barrier = new CyclicBarrier(2);
-
-		public int n;
-
-		public void foo(String foo) throws Exception {
-			barrier.await(10, TimeUnit.SECONDS);
-			if (n++ > 0) {
-				throw new RuntimeException("bar");
-			}
-		}
-
-	}
-
-}