1 files changed, 4 insertions, 3 deletions
diff --git a/test/net/http/utils.rb b/test/net/http/utils.rb
index 1d43497af0..b41341d0a0 100644
--- a/test/net/http/utils.rb
+++ b/test/net/http/utils.rb
@@ -27,12 +27,14 @@ module TestNetHTTPUtils
     def start
       @thread = Thread.new do
         loop do
-          socket = @ssl_server ? @ssl_server.accept : @server.accept
+          socket = (@ssl_server || @server).accept
           run(socket)
         rescue
         ensure
-          socket.close if socket
+          socket&.close
         end
+      ensure
+        (@ssl_server || @server).close
       end
     end
 
@@ -42,7 +44,6 @@ module TestNetHTTPUtils
 
     def shutdown
       @thread&.kill
-      @server&.close
       @thread&.join
     end