diff --git a/ChangeLog b/ChangeLog
index 4623ffc071..be69c62c91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 23 10:22:24 2014  Eric Wong  <e@80x24.org>
+
+	* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking):
+	  ensure exit! during fork failure
+
 Thu Oct 23 10:21:21 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
 
 	* NEWS: Added String#unicode_normalize(|!|d?) [ci skip]
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index b314b7f38a..2a13819dca 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -1922,6 +1922,7 @@ EOS
     er, ew = IO.pipe
     unless runner = IO.popen("-")
       er.close
+      status = true
       begin
         $stderr.reopen($stdout)
         trap(:QUIT) {}
@@ -1934,10 +1935,13 @@ EOS
           $stdout.flush
         end
       ensure
-        ew.puts([Marshal.dump($!)].pack("m0")) if $!
+        if $!
+          ew.puts([Marshal.dump($!)].pack("m0"))
+          status = false
+        end
         ew.close
+        exit!(status)
       end
-      exit!(true)
     end
     ew.close
     begin