diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpOutboundGatewayTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpOutboundGatewayTests.java
index 3a91365197..0e76528ef4 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpOutboundGatewayTests.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpOutboundGatewayTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -377,12 +377,14 @@ public class TcpOutboundGatewayTests extends LogAdjustingTestSupport {
 								oos.writeObject(request.replace("Test", "Reply"));
 								logger.debug("Replied to " + request);
 								lastReceived.set(request);
-								serverLatch.countDown();
 							}
 							catch (IOException e) {
 								logger.debug("error on write " + e.getClass().getSimpleName());
 								socket.close();
 							}
+							finally {
+								serverLatch.countDown();
+							}
 						}
 					}
 				}