diff --git a/ambry-network/src/test/java/com/github/ambry/network/EchoServer.java b/ambry-network/src/test/java/com/github/ambry/network/EchoServer.java
index 178c6f6abe..206cf46e26 100644
--- a/ambry-network/src/test/java/com/github/ambry/network/EchoServer.java
+++ b/ambry-network/src/test/java/com/github/ambry/network/EchoServer.java
@@ -119,8 +119,20 @@ public void run() {
   }
 
   public void closeConnections() throws IOException {
+    IOException first = null;
     for (Socket socket : sockets) {
-      socket.close();
+      try {
+        socket.close();
+      } catch (Exception e) {
+        if (first == null) {
+          first = e;
+        } else {
+          first.addSuppressed(e);
+        }
+      }
+      if (first != null) {
+        return first;
+      }
     }
   }