diff --git a/stomp/testsuite/read1.cc b/stomp/testsuite/read1.cc
index 2d89dd70..916ea0f8 100644
--- a/stomp/testsuite/read1.cc
+++ b/stomp/testsuite/read1.cc
@@ -36,9 +36,9 @@ BOOST_AUTO_TEST_CASE(test1)
 
 BOOST_AUTO_TEST_CASE(test2)
 {
-    // optional content-lenght
+    // optional content-lenght and body with null character
 
-    istringstream s1("HELLO\nkey:value\ncontent-length:5\n\nWORLD" + null);
+    istringstream s1("HELLO\nkey:value\ncontent-length:5\n\nW" + null + "RLD" + null);
     istream s2(s1.rdbuf());
 
     Message msg = read_message(s2);
@@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE(test2)
     BOOST_CHECK_EQUAL(msg.headers["key"], "value");
     BOOST_CHECK_EQUAL(msg.headers["content-length"], "5");
 
-    BOOST_CHECK_EQUAL(msg.body, "WORLD");
+    BOOST_CHECK_EQUAL(msg.body, "W" + null + "RLD");
 }