diff --git a/ChangeLog b/ChangeLog
index 1bdf5393..56e6180d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-24  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Updated CookieStorageTest
+	* test/CookieStorageTest.cc
+
 2009-06-21  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	In TLSContext::addClientKeyFile() and addTrustedCACertFile(),
diff --git a/test/CookieStorageTest.cc b/test/CookieStorageTest.cc
index ad223847..2a3c4437 100644
--- a/test/CookieStorageTest.cc
+++ b/test/CookieStorageTest.cc
@@ -257,12 +257,7 @@ void CookieStorageTest::testLoad_sqlite3()
 void CookieStorageTest::testLoad_fileNotfound()
 {
   CookieStorage st;
-  try {
-    st.load("/tmp/aria2_CookieStorageTest_testLoad_fileNotfound");
-    CPPUNIT_FAIL("exception must be thrown.");
-  } catch(RecoverableException& e) {
-    // success
-  }
+  CPPUNIT_ASSERT(!st.load("/tmp/aria2_CookieStorageTest_testLoad_fileNotfound"));
 }
 
 void CookieStorageTest::testSaveNsFormat()
@@ -290,12 +285,7 @@ void CookieStorageTest::testSaveNsFormat_fail()
     f.mkdirs();
   }
   CookieStorage st;
-  try {
-    st.saveNsFormat(filename);
-    CPPUNIT_FAIL("exception should be thrown.");
-  } catch(RecoverableException& e) {
-    // OK
-  }
+  CPPUNIT_ASSERT(!st.saveNsFormat(filename));
 }
 
 } // namespace aria2