diff --git a/ChangeLog b/ChangeLog
index c7553d27a6..e93970eba4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Apr 23 22:07:00 2012  Tanaka Akira  <akr@fsij.org>
+
+	* test/socket/test_unix.rb (bound_unix_socket): make temporary
+	  filename shorter for less possibility of Unix socket path over
+	  107 bytes when TMPDIR has long path.
+
 Mon Apr 23 20:35:49 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (szInternalCmds, internal_match, internal_cmd_match):
diff --git a/test/socket/test_unix.rb b/test/socket/test_unix.rb
index a9918b108b..a457ee586b 100644
--- a/test/socket/test_unix.rb
+++ b/test/socket/test_unix.rb
@@ -244,7 +244,7 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase
   end
 
   def bound_unix_socket(klass)
-    tmpfile = Tempfile.new("testrubysock")
+    tmpfile = Tempfile.new("s")
     path = tmpfile.path
     tmpfile.close(true)
     yield klass.new(path), path