diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb
index aabd0c9308..1926c90e3b 100644
--- a/test/rubygems/test_gem_remote_fetcher.rb
+++ b/test/rubygems/test_gem_remote_fetcher.rb
@@ -723,9 +723,13 @@ gems:
         @proxy_server = nil
       end
       if @ssl_server
-        @ssl_server.kill.join
+        @ssl_server.stop
         @ssl_server = nil
       end
+      if @ssl_server_thread
+        @ssl_server_thread.kill.join
+        @ssl_server_thread = nil
+      end
     end
 
     def normal_server_port
@@ -776,7 +780,8 @@ gems:
           raise
         end
       end
-      @ssl_server = t
+      @ssl_server = server
+      @ssl_server_thread = t
       server
     end