diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
@@ -959,7 +959,9 @@ class TestUnixDatagramServer(TestUDPServer):

@unittest.skipUnless(threading, 'Threading required for this test.')
class SMTPHandlerTest(BaseTest):
-    TIMEOUT = 8.0
    def test_basic(self):
        sockmap = {}
        server = TestSMTPServer((support.HOST, 0), self.process_message, 0.001,
@@ -973,7 +975,7 @@ def test_basic(self):
        r = logging.makeLogRecord({'msg': 'Hello \u2713'})
        self.handled = threading.Event()
        h.handle(r)
-        self.handled.wait(self.TIMEOUT)  # 14314: don't wait forever
        server.stop()
        self.assertTrue(self.handled.is_set())
        self.assertEqual(len(self.messages), 1)