diff --git a/ChangeLog b/ChangeLog
index b5d5263a..e0379bbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-12  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Added testcase for File::mkdirs().
+	* test/FileTest.cc
+
 2010-10-12  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Rewritten AbstractDiskWriter::openFile() without File::exists().
diff --git a/test/FileTest.cc b/test/FileTest.cc
index 93e35ab3..7fac1266 100644
--- a/test/FileTest.cc
+++ b/test/FileTest.cc
@@ -112,19 +112,38 @@ void FileTest::testSize() {
 }
 
 void FileTest::testMkdir() {
-  std::string dir = "./aria2_FileTest_testMkdir/test";
-  File d(dir);
-  if(d.exists()) {
-    CPPUNIT_ASSERT(d.remove());
+  {
+    std::string dir = "./aria2_FileTest_testMkdir/test";
+    File d(dir);
+    if(d.exists()) {
+      CPPUNIT_ASSERT(d.remove());
+    }
+    CPPUNIT_ASSERT(!d.exists());
+
+    CPPUNIT_ASSERT(d.mkdirs());
+
+    CPPUNIT_ASSERT(d.exists());
+    // this test failes because d.mkdir returns false when the directory is
+    // already exists.
+    CPPUNIT_ASSERT(!d.mkdirs());
   }
-  CPPUNIT_ASSERT(!d.exists());
+  {
+    std::string dir = ".////aria2_FileTest_testMkdir////test2///";
+    std::string nDir = "./aria2_FileTest_testMkdir/test2";
+    File d(dir);
+    File nd(nDir);
+    if(d.exists()) {
+      CPPUNIT_ASSERT(d.remove());
+    }
+    CPPUNIT_ASSERT(!nd.exists());
 
-  CPPUNIT_ASSERT(d.mkdirs());
+    CPPUNIT_ASSERT(d.mkdirs());
 
-  CPPUNIT_ASSERT(d.exists());
-  // this test failes because d.mkdir returns false when the directory is
-  // already exists.
-  CPPUNIT_ASSERT(!d.mkdirs());
+    CPPUNIT_ASSERT(nd.exists());
+    // this test failes because d.mkdir returns false when the directory is
+    // already exists.
+    CPPUNIT_ASSERT(!d.mkdirs());
+  }  
 }
 
 void FileTest::testGetDirname()