diff --git a/src/test/java/me/bvn13/sewy/EchoClientListener.java b/src/test/java/me/bvn13/sewy/EchoClientListener.java
index 3ad4a45..e3909e4 100644
--- a/src/test/java/me/bvn13/sewy/EchoClientListener.java
+++ b/src/test/java/me/bvn13/sewy/EchoClientListener.java
@@ -9,6 +9,8 @@ public class EchoClientListener extends AbstractClientListener {
 
     @Override
     public void run() {
-        writeLine(readLine());
+        while (socket.isConnected()) {
+            writeLine(readLine());
+        }
     }
 }
diff --git a/src/test/java/me/bvn13/sewy/ServerTest.java b/src/test/java/me/bvn13/sewy/ServerTest.java
index f51c17e..097151d 100644
--- a/src/test/java/me/bvn13/sewy/ServerTest.java
+++ b/src/test/java/me/bvn13/sewy/ServerTest.java
@@ -57,8 +57,11 @@ public class ServerTest {
         new Server("localhost", port, EchoClientListener.class);
         Client client = new Client("localhost", port);
         client.writeLine("hello");
-        String response = client.readLine();
-        Assertions.assertEquals("hello", response);
+        String response1 = client.readLine();
+        Assertions.assertEquals("hello", response1);
+        client.writeLine("olleh");
+        String response2 = client.readLine();
+        Assertions.assertEquals("olleh", response2);
     }
 
 }