diff --git a/ChangeLog b/ChangeLog
index 087b1e3442..3832e83361 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jun 18 18:24:12 2015  Eric Wong  <e@80x24.org>
+
+	* test/socket/test_unix.rb: replace sleep with select
+
 Thu Jun 18 17:59:06 2015  Koichi Sasada  <ko1@atdot.net>
 
 	* vm.c (rb_vm_control_frame_id_and_class): remove usless codes.
diff --git a/test/socket/test_unix.rb b/test/socket/test_unix.rb
index 344dcc90ad..9ca97d2998 100644
--- a/test/socket/test_unix.rb
+++ b/test/socket/test_unix.rb
@@ -388,7 +388,7 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase
 
     buf = ""
     s2.send("BBBBBB", 0)
-    sleep 0.1
+    IO.select([s1])
     rv = s1.recv(100, 0, buf)
     assert_equal buf.object_id, rv.object_id
     assert_equal "BBBBBB", rv