diff --git a/stdlib/2/socket.pyi b/stdlib/2/socket.pyi
index 83ac7493fcf9..a3072a41527d 100644
--- a/stdlib/2/socket.pyi
+++ b/stdlib/2/socket.pyi
@@ -335,10 +335,12 @@ def create_connection(address: Tuple[str, int],
                       source_address: Tuple[str, int] = ...) -> socket: ...
 
 # the 5th tuple item is an address
+# TODO the "Tuple[Any, ...]" should be "Union[Tuple[str, int], Tuple[str, int, int, int]]" but that triggers
+# https://github.com/python/mypy/issues/2509
 def getaddrinfo(
         host: Optional[str], port: Union[str, int, None], family: int = ...,
         socktype: int = ..., proto: int = ...,
-        flags: int = ...) -> List[Tuple[int, int, int, str, Union[Tuple[str, int], Tuple[str, int, int, int]]]]:
+        flags: int = ...) -> List[Tuple[int, int, int, str, Tuple[Any, ...]]]:
     ...
 
 def getfqdn(name: str = ...) -> str: ...
diff --git a/stdlib/3.4/asyncio/events.pyi b/stdlib/3.4/asyncio/events.pyi
index 7aaa331e2b49..668705e98aaf 100644
--- a/stdlib/3.4/asyncio/events.pyi
+++ b/stdlib/3.4/asyncio/events.pyi
@@ -93,8 +93,10 @@ class AbstractEventLoop(metaclass=ABCMeta):
     # Network I/O methods returning Futures.
     @abstractmethod
     @coroutine
+    # TODO the "Tuple[Any, ...]" should be "Union[Tuple[str, int], Tuple[str, int, int, int]]" but that triggers
+    # https://github.com/python/mypy/issues/2509
     def getaddrinfo(self, host: str, port: int, *,
-        family: int = ..., type: int = ..., proto: int = ..., flags: int = ...) -> Generator[Any, None, List[Tuple[int, int, int, str, Union[Tuple[str, int], Tuple[str, int, int, int]]]]]: ...
+        family: int = ..., type: int = ..., proto: int = ..., flags: int = ...) -> Generator[Any, None, List[Tuple[int, int, int, str, Tuple[Any, ...]]]]: ...
     @abstractmethod
     @coroutine
     def getnameinfo(self, sockaddr: tuple, flags: int = ...) -> Generator[Any, None, Tuple[str, int]]: ...
diff --git a/stdlib/3/socket.pyi b/stdlib/3/socket.pyi
index f6c7278986ba..0675df1c1c91 100644
--- a/stdlib/3/socket.pyi
+++ b/stdlib/3/socket.pyi
@@ -331,10 +331,12 @@ def create_connection(address: Tuple[str, int],
                       source_address: Tuple[str, int] = ...) -> socket: ...
 
 # the 5th tuple item is an address
+# TODO the "Tuple[Any, ...]" should be "Union[Tuple[str, int], Tuple[str, int, int, int]]" but that triggers
+# https://github.com/python/mypy/issues/2509
 def getaddrinfo(
         host: Optional[str], port: Union[str, int, None], family: int = ...,
         socktype: int = ..., proto: int = ...,
-        flags: int = ...) -> List[Tuple[int, int, int, str, Union[Tuple[str, int], Tuple[str, int, int, int]]]]:
+        flags: int = ...) -> List[Tuple[int, int, int, str, Tuple[Any, ...]]]:
     ...
 
 def getfqdn(name: str = ...) -> str: ...