diff --git a/ChangeLog b/ChangeLog
index 8b955e212e..16398dc209 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 15 23:58:46 2007  Tanaka Akira  <akr@fsij.org>
+
+	* test/openssl/test_pair.rb (SSLPair#ssl_pair): join the thread, even
+	  on an error.
+
 Sat Dec 15 23:50:31 2007  Tanaka Akira  <akr@fsij.org>
 
 	* test/xmlrpc/webrick_testing.rb: join webrick server thread.
diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb
index 7273554362..17713c9988 100644
--- a/test/openssl/test_pair.rb
+++ b/test/openssl/test_pair.rb
@@ -54,6 +54,11 @@ module SSLPair
     else
       return c, s
     end
+  ensure
+    if th && th.alive?
+      th.kill
+      th.join 
+    end
   end
 end