diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py
index b8dfad279f3..8f875ffb5f6 100644
--- a/Lib/test/test_asyncore.py
+++ b/Lib/test/test_asyncore.py
@@ -484,8 +484,9 @@ class TCPServer(asyncore.dispatcher):
         return self.socket.getsockname()[:2]
 
     def handle_accept(self):
-        sock, addr = self.accept()
-        self.handler(sock)
+        pair = self.accept()
+        if pair is not None:
+            self.handler(pair[0])
 
     def handle_error(self):
         raise
diff --git a/Misc/NEWS b/Misc/NEWS
index 5052009e738..216346e4a43 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -435,6 +435,8 @@ Extension Modules
 Tests
 -----
 
+- Issue #16274: Fix test_asyncore on Solaris.  Patch by Giampaolo Rodola'.
+
 - Issue #15040: Close files in mailbox tests for PyPy compatibility.
   Original patch by Matti Picus.