1 files changed, 3 insertions, 4 deletions
diff --git a/test/webrick/utils.rb b/test/webrick/utils.rb
index ef4654cafd..15852ca47d 100644
--- a/test/webrick/utils.rb
+++ b/test/webrick/utils.rb
@@ -36,14 +36,13 @@ module TestWEBrick
       :AccessLog => [[logger, ""]]
     }.update(config))
     begin
-      server.start
+      server_thread = server.start
       addr = server.listeners[0].addr
       block.yield([server, addr[3], addr[1], log])
     ensure
       server.shutdown
-      until server.status == :Stop
-        sleep 0.1
-      end
+
+      server_thread.join
     end
     log_string
   end