diff --git a/test/net/http/utils.rb b/test/net/http/utils.rb
index 7110a2432f..c629da8808 100644
--- a/test/net/http/utils.rb
+++ b/test/net/http/utils.rb
@@ -34,9 +34,7 @@ module TestNetHTTPUtils
   def teardown
     if @server
       @server.shutdown
-      until @server.status == :Stop
-        sleep 0.1
-      end
+      @server_thread.join
     end
     # resume global state
     Net::HTTP.version_1_2
@@ -63,7 +61,7 @@ module TestNetHTTPUtils
     end
     @server = WEBrick::HTTPServer.new(server_config)
     @server.mount('/', Servlet, config('chunked'))
-    @server.start
+    @server_thread = @server.start
     @config['port'] = @server[:Port]
     n_try_max = 5
     begin