diff --git a/ChangeLog b/ChangeLog
index 7c8c423c5d..e724f71a31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jun 24 22:11:37 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_nolock):
+	  skip a failing test on Windows because flock() implementation is
+	  different from Unix.
+
 Mon Jun 24 22:06:14 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
 
 	* test/rubygems/test_gem_installer.rb (test_install_extension_flat):
diff --git a/test/gdbm/test_gdbm.rb b/test/gdbm/test_gdbm.rb
index 7d695d6e0a..d3eaa77f50 100644
--- a/test/gdbm/test_gdbm.rb
+++ b/test/gdbm/test_gdbm.rb
@@ -190,6 +190,10 @@ if defined? GDBM
 
       STDERR.puts Dir.glob("#{dbname}*") if $DEBUG
 
+      # The following test fails on Windows because flock() implementation
+      # is different from Unix.
+      return if /mswin|mingw/ =~ RUBY_PLATFORM
+
       open_db_child(dbname) do
         assert_nothing_raised(Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::EACCES) {
           # this test is failed on Cygwin98 (???)