diff --git a/ChangeLog b/ChangeLog
index 6644323057..601d991c1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed May 26 18:40:23 2010  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* test/rinda/test_rinda.rb (class TupleSpaceTest): kill a used thread
+	  at teardown. [ruby-dev:41397]
+	* test/rinda/test_rinda.rb (class TupleSpaceProxyTest): ditto.
+
 Wed May 26 12:08:06 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* random.c (random_rand): subtraction method of non-numeric can
diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb
index 0d94cf70da..b69b63ac78 100644
--- a/test/rinda/test_rinda.rb
+++ b/test/rinda/test_rinda.rb
@@ -519,6 +519,10 @@ class TupleSpaceTest < Test::Unit::TestCase
     ThreadGroup.new.add(Thread.current)
     @ts = Rinda::TupleSpace.new(1)
   end
+  def teardown
+    # implementation-dependent
+    @ts.instance_eval{@keeper.kill if @keeper}
+  end
 end
 
 class TupleSpaceProxyTest < Test::Unit::TestCase
@@ -529,6 +533,10 @@ class TupleSpaceProxyTest < Test::Unit::TestCase
     @ts_base = Rinda::TupleSpace.new(1)
     @ts = Rinda::TupleSpaceProxy.new(@ts_base)
   end
+  def teardown
+    # implementation-dependent
+    @ts_base.instance_eval{@keeper.kill if @keeper}
+  end
 
   def test_remote_array_and_hash
     @ts.write(DRbObject.new([1, 2, 3]))