diff --git a/ChangeLog b/ChangeLog
index 886793c34a..d472cfa111 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Nov 14 16:16:17 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/net/http/test_https_proxy.rb
+	  (HTTPSProxyTest::test_https_proxy_authentication): initialize
+	  local variable 't' first.  [ruby-dev:32253]
+
 Wed Nov 14 15:39:24 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* test/socket/test_socket.rb: update not to use 1.8 assignment to
diff --git a/test/net/http/test_https_proxy.rb b/test/net/http/test_https_proxy.rb
index 6332319f26..66ca3ddd9b 100644
--- a/test/net/http/test_https_proxy.rb
+++ b/test/net/http/test_https_proxy.rb
@@ -6,6 +6,7 @@ require 'test/unit'
 
 class HTTPSProxyTest < Test::Unit::TestCase
   def test_https_proxy_authentication
+    t = nil
     TCPServer.open("127.0.0.1", 0) {|serv|
       _, port, _, _ = serv.addr
       t = Thread.new {
@@ -25,6 +26,8 @@ class HTTPSProxyTest < Test::Unit::TestCase
         proxy_request,
         "[ruby-dev:25673]")
     }
+  ensure
+    t.join if t
   end
 end if defined?(OpenSSL)