diff --git a/ChangeLog b/ChangeLog
index 641d2cd551..518df3e344 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Apr 25 23:39:42 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* test/rinda/test_rinda.rb (TupleSpaceProxyTest#test_take_bug_8215):
+	  use KILL on Windows since TERM doen't work and ruby process remains
+	  after test-all on Windows.
+
 Thu Apr 25 23:16:28 2013  Tanaka Akira  <akr@fsij.org>
 
 	* ext/curses/extconf.rb: Implement
diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb
index 946af97988..577eb1a7e5 100644
--- a/test/rinda/test_rinda.rb
+++ b/test/rinda/test_rinda.rb
@@ -515,8 +515,9 @@ class TupleSpaceProxyTest < Test::Unit::TestCase
     assert_equal([[:test_take, 42]], @ts_base.read_all([:test_take, nil]),
                  '[bug:8215] tuple lost')
   ensure
-    Process.kill("TERM", write) if write && status.nil?
-    Process.kill("TERM", take)  if take
+    signal = /mswin|mingw/ =~ RUBY_PLATFORM ? "KILL" : "TERM"
+    Process.kill(signal, write) if write && status.nil?
+    Process.kill(signal, take)  if take
   end
 
   def have_fork?