diff --git a/test/spec_webrick.rb b/test/spec_webrick.rb
index aa44813ae..f3d6fb077 100644
--- a/test/spec_webrick.rb
+++ b/test/spec_webrick.rb
@@ -14,7 +14,7 @@
                                     :AccessLog => [])
   @server.mount "/test", Rack::Handler::WEBrick,
     Rack::Lint.new(TestRequest.new)
-  Thread.new { @server.start }
+  @thread = Thread.new { @server.start }
   trap(:INT) { @server.shutdown }
   end
 
@@ -185,5 +185,6 @@
 
   after do
   @server.shutdown
+  @thread.join
   end
 end