diff --git a/ChangeLog b/ChangeLog
index e27332d7e..ce5c14551 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-15  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Removed test file
+	* test/CookieStorageTest.cc
+
 2010-02-15  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Check both EAGAIN and EWOULDBLOCK
diff --git a/test/CookieStorageTest.cc b/test/CookieStorageTest.cc
index a71d273e4..8ca7acf07 100644
--- a/test/CookieStorageTest.cc
+++ b/test/CookieStorageTest.cc
@@ -348,9 +348,9 @@ void CookieStorageTest::testSaveNsFormat_fail()
 {
   std::string filename = "/tmp/aria2_CookieStorageTest_testSaveNsFormat_fail";
   File f(filename);
-  if(!f.exists()) {
-    f.mkdirs();
-  }
+  f.remove();
+  f.mkdirs();
+  CPPUNIT_ASSERT(f.isDir());
   CookieStorage st;
   CPPUNIT_ASSERT(!st.saveNsFormat(filename));
 }