diff --git a/ChangeLog b/ChangeLog
index fa5f0039fc..dc3debf356 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun  4 00:44:27 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/fileutils/test_fileutils.rb (TestFileUtils#test_mkdir): add
+	  EEXIST for Linux. (suggested by nurse)
+
 Mon Jun  3 23:58:19 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* lib/fileutils.rb (FileUtils.rmdir): use remove_tailing_slash.
diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb
index 13fb26abc6..f4996e5b9e 100644
--- a/test/fileutils/test_fileutils.rb
+++ b/test/fileutils/test_fileutils.rb
@@ -759,7 +759,8 @@ class TestFileUtils
     assert_equal 0700, (File.stat('tmp/tmp').mode & 0777) if have_file_perm?
     Dir.rmdir 'tmp/tmp'
 
-    assert_raise(Errno::EISDIR) {
+    # EISDIR on OS X, FreeBSD; EEXIST on Linux
+    assert_raise(Errno::EISDIR, Errno::EEXIST) {
       mkdir '/'
     }
   end