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 cf3aa93c2b..ff274dc6e2 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
@@ -334,6 +334,10 @@ public class TcpNioConnectionTests {
 				logger.debug("Expected timeout", e);
 				throw (Exception) e.getCause();
 			}
+			finally {
+				connection.setPipeTimeout(15);
+				connection.close();
+			}
 			return null;
 		});
 		try {