diff --git a/stdlib/3.4/asyncio/__init__.pyi b/stdlib/3.4/asyncio/__init__.pyi
index 8bec9bae5..7eb6e883e 100644
--- a/stdlib/3.4/asyncio/__init__.pyi
+++ b/stdlib/3.4/asyncio/__init__.pyi
@@ -37,6 +37,9 @@ from asyncio.transports import (
 )
 from asyncio.futures import (
     Future as Future,
+    CancelledError as CancelledError,
+    TimeoutError as TimeoutError,
+    InvalidStateError as InvalidStateError,
 )
 from asyncio.tasks import (
     FIRST_COMPLETED as FIRST_COMPLETED,
diff --git a/stdlib/3.4/asyncio/futures.pyi b/stdlib/3.4/asyncio/futures.pyi
index eab1d4cfb..22d97bdaf 100644
--- a/stdlib/3.4/asyncio/futures.pyi
+++ b/stdlib/3.4/asyncio/futures.pyi
@@ -5,6 +5,15 @@ __all__ = ... # type: str
 
 _T = TypeVar('_T')
 
+from concurrent.futures._base import (
+    Error as Error,
+)
+from concurrent.futures import (
+    CancelledError as CancelledError,
+    TimeoutError as TimeoutError,
+)
+class InvalidStateError(Error): ...
+
 class _TracebackLogger:
     __slots__ = ... # type: List[str]
     exc = ...  # type: BaseException
diff --git a/stdlib/3.4/asyncio/tasks.pyi b/stdlib/3.4/asyncio/tasks.pyi
index d41621b79..8d6d7fb8a 100644
--- a/stdlib/3.4/asyncio/tasks.pyi
+++ b/stdlib/3.4/asyncio/tasks.pyi
@@ -30,7 +30,7 @@ def sleep(delay: float, result: _T = ..., loop: AbstractEventLoop = ...) -> Futu
 def wait(fs: List[Task[_T]], *, loop: AbstractEventLoop = ...,
     timeout: float = ...,
          return_when: str = ...) -> Future[Tuple[Set[Future[_T]], Set[Future[_T]]]]: ...
-def wait_for(fut: Union[Future[_T], Generator[Any, None, _T]], timeout: Optional[float],
+def wait_for(fut: Union[Future[_T], Generator[Any, None, _T], Awaitable[_T]], timeout: Optional[float],
              *, loop: AbstractEventLoop = ...) -> Future[_T]: ...
 
 class Task(Future[_T], Generic[_T]):