diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NetSocketWriterTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NetSocketWriterTests.java
index 7107ea21d4..27371586d8 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NetSocketWriterTests.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NetSocketWriterTests.java
@@ -59,6 +59,7 @@ public class NetSocketWriterTests {
 		t.setDaemon(true);
 		t.start();
 		Socket socket = server.accept();
+		socket.setSoTimeout(5000);
 		InputStream is = socket.getInputStream();
 		byte[] buff = new byte[testString.length() + 4];
 		readFully(is, buff);
@@ -91,6 +92,7 @@ public class NetSocketWriterTests {
 		t.setDaemon(true);
 		t.start();
 		Socket socket = server.accept();
+		socket.setSoTimeout(5000);
 		InputStream is = socket.getInputStream();
 		byte[] buff = new byte[testString.length() + 2];
 		readFully(is, buff);
@@ -123,6 +125,7 @@ public class NetSocketWriterTests {
 		t.setDaemon(true);
 		t.start();
 		Socket socket = server.accept();
+		socket.setSoTimeout(5000);
 		InputStream is = socket.getInputStream();
 		byte[] buff = new byte[testString.length() + 2];
 		readFully(is, buff);
@@ -154,6 +157,7 @@ public class NetSocketWriterTests {
 		t.setDaemon(true);
 		t.start();
 		Socket socket = server.accept();
+		socket.setSoTimeout(5000);
 		InputStream is = socket.getInputStream();
 		ObjectInputStream ois = new ObjectInputStream(is);
 		assertEquals(testString, ois.readObject());
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NioSocketWriterTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NioSocketWriterTests.java
index b2a80d6695..269af7e029 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NioSocketWriterTests.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/NioSocketWriterTests.java
@@ -139,6 +139,7 @@ public class NioSocketWriterTests {
 		t.setDaemon(true);
 		t.start();
 		Socket socket = server.accept();
+		socket.setSoTimeout(5000);
 		InputStream is = socket.getInputStream();
 		byte[] buff = new byte[testString.length() + 4];
 		readFully(is, buff);
@@ -175,6 +176,7 @@ public class NioSocketWriterTests {
 		t.setDaemon(true);
 		t.start();
 		Socket socket = server.accept();
+		socket.setSoTimeout(5000);
 		InputStream is = socket.getInputStream();
 		byte[] buff = new byte[testString.length() + 2];
 		readFully(is, buff);
@@ -211,6 +213,7 @@ public class NioSocketWriterTests {
 		t.setDaemon(true);
 		t.start();
 		Socket socket = server.accept();
+		socket.setSoTimeout(5000);
 		InputStream is = socket.getInputStream();
 		byte[] buff = new byte[testString.length() + 2];
 		readFully(is, buff);
@@ -249,6 +252,7 @@ public class NioSocketWriterTests {
 		t.setDaemon(true);
 		t.start();
 		Socket socket = server.accept();
+		socket.setSoTimeout(5000);
 		InputStream is = socket.getInputStream();
 		byte[] buff = new byte[testString.length() + 4];
 		readFully(is, buff);
@@ -286,6 +290,7 @@ public class NioSocketWriterTests {
 		t.setDaemon(true);
 		t.start();
 		Socket socket = server.accept();
+		socket.setSoTimeout(5000);
 		InputStream is = socket.getInputStream();
 		byte[] buff = new byte[testString.length() + 2];
 		readFully(is, buff);
@@ -323,6 +328,7 @@ public class NioSocketWriterTests {
 		t.setDaemon(true);
 		t.start();
 		Socket socket = server.accept();
+		socket.setSoTimeout(5000);
 		InputStream is = socket.getInputStream();
 		byte[] buff = new byte[testString.length() + 2];
 		readFully(is, buff);
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGatewayTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGatewayTests.java
index bc43544981..8f818a58ed 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGatewayTests.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGatewayTests.java
@@ -64,6 +64,7 @@ public class SimpleTcpNetInboundGatewayTests {
 	public void testCrLf() throws Exception {
 		waitListening(gatewayCrLf);
 		Socket socket = SocketFactory.getDefault().createSocket("localhost", gatewayCrLf.getPort());
+		socket.setSoTimeout(5000);
 		String greetings = "Hello World!";
 		socket.getOutputStream().write((greetings + "\r\n").getBytes());
 		StringBuilder sb = new StringBuilder();
@@ -82,6 +83,7 @@ public class SimpleTcpNetInboundGatewayTests {
 	public void testStxEtx() throws Exception {
 		waitListening(gatewayStxEtx);
 		Socket socket = SocketFactory.getDefault().createSocket("localhost", gatewayStxEtx.getPort());
+		socket.setSoTimeout(5000);
 		String greetings = "Hello World!";
 		socket.getOutputStream().write(MessageFormats.STX);
 		socket.getOutputStream().write((greetings).getBytes());
@@ -105,6 +107,7 @@ public class SimpleTcpNetInboundGatewayTests {
 	public void testSerialized() throws Exception {
 		waitListening(gatewaySerialized);
 		Socket socket = SocketFactory.getDefault().createSocket("localhost", gatewaySerialized.getPort());
+		socket.setSoTimeout(5000);
 		String greetings = "Hello World!";
 		new ObjectOutputStream(socket.getOutputStream()).writeObject(greetings);
 		String echo = (String) new ObjectInputStream(socket.getInputStream()).readObject();
@@ -115,6 +118,7 @@ public class SimpleTcpNetInboundGatewayTests {
 	public void testLength() throws Exception {
 		waitListening(gatewayLength);
 		Socket socket = SocketFactory.getDefault().createSocket("localhost", gatewayLength.getPort());
+		socket.setSoTimeout(5000);
 		String greetings = "Hello World!";
 		byte[] header = new byte[4];
 		header[3] = (byte) greetings.length();
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 6c9ba8b4e7..35c849a4b4 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
@@ -57,6 +57,7 @@ public class TcpSendingMessageHandlerTests {
 		t.setDaemon(true);
 		t.start();
 		Socket socket = server.accept();
+		socket.setSoTimeout(5000);
 		InputStream is = socket.getInputStream();
 		byte[] buff = new byte[testString.length() + 2];
 		readFully(is, buff);
@@ -88,6 +89,7 @@ public class TcpSendingMessageHandlerTests {
 		t.setDaemon(true);
 		t.start();
 		Socket socket = server.accept();
+		socket.setSoTimeout(5000);
 		InputStream is = socket.getInputStream();
 		byte[] buff = new byte[24];
 		readFully(is, buff);
@@ -117,6 +119,7 @@ public class TcpSendingMessageHandlerTests {
 		t.setDaemon(true);
 		t.start();
 		Socket socket = server.accept();
+		socket.setSoTimeout(5000);
 		InputStream is = socket.getInputStream();
 		byte[] buff = new byte[testString.length() + 2];
 		readFully(is, buff);
@@ -148,6 +151,7 @@ public class TcpSendingMessageHandlerTests {
 		t.setDaemon(true);
 		t.start();
 		Socket socket = server.accept();
+		socket.setSoTimeout(5000);
 		InputStream is = socket.getInputStream();
 		byte[] buff = new byte[testString.length() + 2];
 		readFully(is, buff);
@@ -179,6 +183,7 @@ public class TcpSendingMessageHandlerTests {
 		t.setDaemon(true);
 		t.start();
 		Socket socket = server.accept();
+		socket.setSoTimeout(5000);
 		InputStream is = socket.getInputStream();
 		byte[] buff = new byte[24];
 		readFully(is, buff);