diff --git a/ChangeLog b/ChangeLog
index d6433a0b3f..5622b06d48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jul 10 18:29:41 2008  wanabe  <s.wanabe@gmail.com>
+	* test/ruby/envutil.rb (assert_normal_exit): finish writing script
+	  before spawn("ruby") to avoid blocking in win32.
+
 Thu Jul 10 17:20:50 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (insert): follow recent changes of globbing.
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index b9af6ff9cc..09d5d3a09d 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -74,11 +74,11 @@ module Test
       def assert_normal_exit(testsrc, message = '')
         in_c, in_p = IO.pipe
         out_p, out_c = IO.pipe
+        in_p.write testsrc
+        in_p.close
         pid = spawn(EnvUtil.rubybin, '-W0', STDIN=>in_c, STDOUT=>out_c, STDERR=>out_c)
         in_c.close
         out_c.close
-        in_p.write testsrc
-        in_p.close
         msg = out_p.read
         out_p.close
         Process.wait pid