diff --git a/ChangeLog b/ChangeLog
index fe441ce39..bb5090a84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-14  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Added tests the case where length < 0 is specified.
+	* test/BencodeTest.cc
+
 2008-12-14  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Fixed memory leak in decoderawstring()
diff --git a/test/BencodeTest.cc b/test/BencodeTest.cc
index 2f9932157..4df40f4c8 100644
--- a/test/BencodeTest.cc
+++ b/test/BencodeTest.cc
@@ -244,7 +244,19 @@ void BencodeTest::testDecode()
       bencode::decode("x:abc");
       CPPUNIT_FAIL("exception must be thrown.");
     } catch(RecoverableException& e) {
-      CPPUNIT_ASSERT_EQUAL(std::string("Integer expected but none found."),
+      CPPUNIT_ASSERT_EQUAL(std::string("A positive integer expected"
+				       " but none found."),
+			   std::string(e.what()));
+    }
+  }
+  {
+    // string with minus length
+    try {
+      bencode::decode("-1:a");
+      CPPUNIT_FAIL("exception must be thrown.");
+    } catch(RecoverableException& e) {
+      CPPUNIT_ASSERT_EQUAL(std::string("A positive integer expected"
+				       " but none found."),
 			   std::string(e.what()));
     }
   }