diff --git a/spec/browser_spec.rb b/spec/browser_spec.rb
index abf2411..0e39825 100644
--- a/spec/browser_spec.rb
+++ b/spec/browser_spec.rb
@@ -97,11 +97,11 @@ describe Capybara::Driver::Webkit::Browser do
       @pass = 'secret'
       @url  = "http://example.org/"
 
-      serv = TCPServer.new(@host, 0)
-      @port = serv.addr[1]
+      @server = TCPServer.new(@host, 0)
+      @port = @server.addr[1]
 
       @proxy_requests = []
-      @proxy = Thread.new(serv, @proxy_requests) do |serv, proxy_requests|
+      @proxy = Thread.new(@server, @proxy_requests) do |serv, proxy_requests|
         while conn = serv.accept do
           # read request
           request = []
@@ -141,6 +141,7 @@ describe Capybara::Driver::Webkit::Browser do
 
     after do
       @proxy.kill
+      @server.shutdown
     end
 
     it 'uses the HTTP proxy correctly' do