diff --git a/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java b/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java
index d4c645e7..705a0c97 100644
--- a/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java
+++ b/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java
@@ -48,6 +48,13 @@ public class TcpClientServerDemoTest {
 		assertEquals("echo:Hello world!", result);
 	}
 	
+	@Test
+	public void testZeroLength() {
+		String result = gw.send("");
+		System.out.println(result);
+		assertEquals("echo:", result);
+	}
+
 	@Test
 	public void testFail() {
 		String result = gw.send("FAIL");