diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
@@ -2587,8 +2587,8 @@ def start(self, flag=None):
        threading.Thread.start(self)

    def run(self):
-        self.sock.settimeout(0.05)
-        self.sock.listen()
        self.active = True
        if self.flag:
            # signal an event
@@ -2602,16 +2602,22 @@ def run(self):
                handler = self.ConnectionHandler(self, newconn, connaddr)
                handler.start()
                handler.join()
-            except TimeoutError:
-                pass
            except KeyboardInterrupt:
                self.stop()
            except BaseException as e:
                if support.verbose and self.chatty:
                    sys.stdout.write(
                        ' connection handling failed: ' + repr(e) + '\n')

-        self.sock.close()

    def stop(self):
        self.active = False