diff --git a/lib/puma/binder.rb b/lib/puma/binder.rb
index 6645a7c71e..1648c33b6e 100644
--- a/lib/puma/binder.rb
+++ b/lib/puma/binder.rb
@@ -165,7 +165,7 @@ def parse(binds, logger)
                 @events.error "Please specify the SSL ca via 'ca='"
               end
             end
-            
+
             ctx.ca = params['ca'] if params['ca']
 
             if  params['verify_mode']
diff --git a/test/test_puma_server.rb b/test/test_puma_server.rb
index ca2a9e2d68..57ffc2c7fd 100644
--- a/test/test_puma_server.rb
+++ b/test/test_puma_server.rb
@@ -59,7 +59,7 @@ def test_puma_socket
       [-1, {}, []]
     end
 
-    @server.add_tcp_listener @host, @server.connected_port
+    @server.add_tcp_listener @host, @port
     @server.run
 
     sock = TCPSocket.new @host, @server.connected_port
@@ -75,7 +75,7 @@ def test_very_large_return
       [200, {}, [giant]]
     end
 
-    @server.add_tcp_listener @host, @server.connected_port
+    @server.add_tcp_listener @host, @port
     @server.run
 
     sock = TCPSocket.new @host, @server.connected_port
@@ -96,7 +96,7 @@ def test_respect_x_forwarded_proto
       [200, {}, [env['SERVER_PORT']]]
     end
 
-    @server.add_tcp_listener @host, @server.connected_port
+    @server.add_tcp_listener @host, @port
     @server.run
 
     req = Net::HTTP::Get.new("/")
@@ -115,7 +115,7 @@ def test_default_server_port
       [200, {}, [env['SERVER_PORT']]]
     end
 
-    @server.add_tcp_listener @host, @server.connected_port
+    @server.add_tcp_listener @host, @port
     @server.run
 
     req = Net::HTTP::Get.new("/")
@@ -159,7 +159,7 @@ def test_GET_with_empty_body_has_sane_chunking
   def test_GET_with_no_body_has_sane_chunking
     @server.app = proc { |env| [200, {}, []] }
 
-    @server.add_tcp_listener @host, @server.connected_port
+    @server.add_tcp_listener @host, @port
     @server.run
 
     sock = TCPSocket.new @host, @server.connected_port