diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 5729678ff54..4ef8c2847c4 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -930,10 +930,10 @@ class SMTPHandlerTest(BaseTest):
     TIMEOUT = 8.0
     def test_basic(self):
         sockmap = {}
-        server = TestSMTPServer(('localhost', 0), self.process_message, 0.001,
+        server = TestSMTPServer((support.HOST, 0), self.process_message, 0.001,
                                 sockmap)
         server.start()
-        addr = ('localhost', server.port)
+        addr = (support.HOST, server.port)
         h = logging.handlers.SMTPHandler(addr, 'me', 'you', 'Log',
                                          timeout=self.TIMEOUT)
         self.assertEqual(h.toaddrs, ['you'])
diff --git a/Misc/NEWS b/Misc/NEWS
index e4912f640d4..403bf878172 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -290,6 +290,8 @@ Tests
 
 - Issue #22770: Prevent some Tk segfaults on OS X when running gui tests.
 
+- Issue #23211: Workaround test_logging failure on some OS X 10.6 systems.
+
 Build
 -----