diff --git a/Lib/test/test_socket_ssl.py b/Lib/test/test_socket_ssl.py
index ae6e1da..c6fddf5 100644
--- a/Lib/test/test_socket_ssl.py
+++ b/Lib/test/test_socket_ssl.py
@@ -52,10 +52,7 @@
 
     # A service which issues a welcome banner (without need to write
     # anything).
-    # XXX ("gmail.org", 995) has been unreliable so far, from time to time
-    # XXX non-responsive for hours on end (& across all buildbot slaves,
-    # XXX so that's not just a local thing).
-    ADDR = "gmail.org", 995
+    ADDR = "pop.gmail.com", 995
 
     s = socket.socket()
     s.settimeout(30.0)