diff --git a/ChangeLog b/ChangeLog
index 0d03b6201f..c9cf189027 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Apr 11 21:02:06 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_file_exhaustive.rb
+	  (TestFileExhaustive#test_stat_socket_p): r50226 accidentally missed
+	  the guard for non-unix environments.
+
 Sat Apr 11 20:14:21 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
 
 	* ext/json/*, test/json/*, defs/default_gems: Gemify JSON library.
diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb
index 9bf99b12ef..ee4045ee6d 100644
--- a/test/ruby/test_file_exhaustive.rb
+++ b/test/ruby/test_file_exhaustive.rb
@@ -1169,7 +1169,7 @@ class TestFileExhaustive < Test::Unit::TestCase
   def test_stat_socket_p
     assert(!(File::Stat.new(@dir).socket?))
     assert(!(File::Stat.new(regular_file).socket?))
-    assert(File::Stat.new(socket).socket?)
+    assert(File::Stat.new(socket).socket?) if socket
   end
 
   def test_stat_blockdev_p ## xxx