diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandlerTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandlerTests.java
index 2b0e8592b6..509b3aa899 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandlerTests.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandlerTests.java
@@ -844,8 +844,8 @@ public class TcpSendingMessageHandlerTests {
 		ccf.setInputConverter(converter);
 		ccf.setOutputConverter(converter);
 		ccf.setSoTimeout(10000);
-		ccf.start();
 		ccf.setSingleUse(true);
+		ccf.start();
 		TcpSendingMessageHandler handler = new TcpSendingMessageHandler();
 		handler.setConnectionFactory(ccf);
 		TcpReceivingChannelAdapter adapter = new TcpReceivingChannelAdapter();
@@ -856,10 +856,10 @@ public class TcpSendingMessageHandlerTests {
 		for (int i = 100; i < 200; i++) {
 			handler.handleMessage(MessageBuilder.withPayload("Test" + i).build());
 		}
-		assertTrue(semaphore.tryAcquire(10, 10000, TimeUnit.MILLISECONDS));
+		assertTrue(semaphore.tryAcquire(100, 20000, TimeUnit.MILLISECONDS));
 		Set<String> replies = new HashSet<String>();
 		for (int i = 100; i < 200; i++) {
-			Message<?> mOut = channel.receive(10000);
+			Message<?> mOut = channel.receive(20000);
 			assertNotNull(mOut);
 			replies.add(new String((byte[])mOut.getPayload()));
 		}
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java
index f3e842a005..c4dbf335a0 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java
@@ -99,7 +99,13 @@ public class TcpNioConnectionTests {
 		try {
 			TcpNioConnection connection = factory.getConnection();
 			connection.send(MessageBuilder.withPayload("Test").build());
-			Thread.sleep(2000);
+			int n = 0;
+			while (connection.isOpen()) {
+				Thread.sleep(100);
+				if (n++ > 200) {
+					break;
+				}
+			}
 			assertTrue(!connection.isOpen());
 		} catch (Exception e) {
 			fail("Unexptected exception " + e);