diff --git a/ChangeLog b/ChangeLog
index d3cc827984..4470b6463f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Oct 16 10:09:02 2014  Eric Wong  <e@80x24.org>
+
+	* test/ruby/test_rubyoptions.rb (test_segv_test): fix race
+
 Thu Oct 16 09:17:48 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* cont.c (rb_fiber_t): fix compile error caused by move to
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index b435bd95d9..8539835f75 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -568,7 +568,7 @@ class TestRubyOptions < Test::Unit::TestCase
   end
 
   def test_segv_test
-    assert_segv(["--disable-gems", "-e", "Process.kill :SEGV, $$"])
+    assert_segv(["--disable-gems", "-e", "Process.kill :SEGV, $$; sleep"])
   end
 
   def test_segv_loaded_features