diff --git a/stdlib/3/unittest/mock.pyi b/stdlib/3/unittest/mock.pyi
index ab376222aced..bf7e3ef769b8 100644
--- a/stdlib/3/unittest/mock.pyi
+++ b/stdlib/3/unittest/mock.pyi
@@ -164,35 +164,63 @@ class _patch(Generic[_T]):
     autospec: Any
     kwargs: Mapping[str, Any]
     additional_patchers: Any
-    @overload
-    def __init__(
-        self: _patch[MagicMock],
-        getter: Callable[[], Any],
-        attribute: str,
-        *,
-        spec: Optional[Any],
-        create: bool,
-        spec_set: Optional[Any],
-        autospec: Optional[Any],
-        new_callable: Optional[Any],
-        kwargs: Mapping[str, Any],
-    ) -> None: ...
-    # This overload also covers the case, where new==DEFAULT. In this case, self is _patch[Any].
-    # Ideally we'd be able to add an overload for it so that self is _patch[MagicMock],
-    # but that's impossible with the current type system.
-    @overload
-    def __init__(
-        self: _patch[_T],
-        getter: Callable[[], Any],
-        attribute: str,
-        new: _T,
-        spec: Optional[Any],
-        create: bool,
-        spec_set: Optional[Any],
-        autospec: Optional[Any],
-        new_callable: Optional[Any],
-        kwargs: Mapping[str, Any],
-    ) -> None: ...
+    if sys.version_info >= (3, 8):
+        @overload
+        def __init__(
+            self: _patch[Union[MagicMock, AsyncMock]],
+            getter: Callable[[], Any],
+            attribute: str,
+            *,
+            spec: Optional[Any],
+            create: bool,
+            spec_set: Optional[Any],
+            autospec: Optional[Any],
+            new_callable: Optional[Any],
+            kwargs: Mapping[str, Any],
+        ) -> None: ...
+        # This overload also covers the case, where new==DEFAULT. In this case, self is _patch[Any].
+        # Ideally we'd be able to add an overload for it so that self is _patch[MagicMock],
+        # but that's impossible with the current type system.
+        @overload
+        def __init__(
+            self: _patch[_T],
+            getter: Callable[[], Any],
+            attribute: str,
+            new: _T,
+            spec: Optional[Any],
+            create: bool,
+            spec_set: Optional[Any],
+            autospec: Optional[Any],
+            new_callable: Optional[Any],
+            kwargs: Mapping[str, Any],
+        ) -> None: ...
+    else:
+        @overload
+        def __init__(
+            self: _patch[MagicMock],
+            getter: Callable[[], Any],
+            attribute: str,
+            *,
+            spec: Optional[Any],
+            create: bool,
+            spec_set: Optional[Any],
+            autospec: Optional[Any],
+            new_callable: Optional[Any],
+            kwargs: Mapping[str, Any],
+        ) -> None: ...
+        @overload
+        def __init__(
+            self: _patch[_T],
+            getter: Callable[[], Any],
+            attribute: str,
+            new: _T,
+            spec: Optional[Any],
+            create: bool,
+            spec_set: Optional[Any],
+            autospec: Optional[Any],
+            new_callable: Optional[Any],
+            kwargs: Mapping[str, Any],
+        ) -> None: ...
     def copy(self) -> _patch[_T]: ...
     def __call__(self, func: Callable[..., _R]) -> Callable[..., _R]: ...
     def decorate_class(self, klass: _TT) -> _TT: ...
@@ -221,59 +249,113 @@ class _patch_dict:
 class _patcher:
     TEST_PREFIX: str
     dict: Type[_patch_dict]
-    @overload
-    def __call__(  # type: ignore
-        self,
-        target: Any,
-        *,
-        spec: Optional[Any] = ...,
-        create: bool = ...,
-        spec_set: Optional[Any] = ...,
-        autospec: Optional[Any] = ...,
-        new_callable: Optional[Any] = ...,
-        **kwargs: Any,
-    ) -> _patch[MagicMock]: ...
-    # This overload also covers the case, where new==DEFAULT. In this case, the return type is _patch[Any].
-    # Ideally we'd be able to add an overload for it so that the return type is _patch[MagicMock],
-    # but that's impossible with the current type system.
-    @overload
-    def __call__(
-        self,
-        target: Any,
-        new: _T,
-        spec: Optional[Any] = ...,
-        create: bool = ...,
-        spec_set: Optional[Any] = ...,
-        autospec: Optional[Any] = ...,
-        new_callable: Optional[Any] = ...,
-        **kwargs: Any,
-    ) -> _patch[_T]: ...
-    @overload
-    def object(  # type: ignore
-        self,
-        target: Any,
-        attribute: str,
-        *,
-        spec: Optional[Any] = ...,
-        create: bool = ...,
-        spec_set: Optional[Any] = ...,
-        autospec: Optional[Any] = ...,
-        new_callable: Optional[Any] = ...,
-        **kwargs: Any,
-    ) -> _patch[MagicMock]: ...
-    @overload
-    def object(
-        self,
-        target: Any,
-        attribute: str,
-        new: _T = ...,
-        spec: Optional[Any] = ...,
-        create: bool = ...,
-        spec_set: Optional[Any] = ...,
-        autospec: Optional[Any] = ...,
-        new_callable: Optional[Any] = ...,
-        **kwargs: Any,
-    ) -> _patch[_T]: ...
+    if sys.version_info >= (3, 8):
+        @overload
+        def __call__(  # type: ignore
+            self,
+            target: Any,
+            *,
+            spec: Optional[Any] = ...,
+            create: bool = ...,
+            spec_set: Optional[Any] = ...,
+            autospec: Optional[Any] = ...,
+            new_callable: Optional[Any] = ...,
+            **kwargs: Any,
+        ) -> _patch[Union[MagicMock, AsyncMock]]: ...
+        # This overload also covers the case, where new==DEFAULT. In this case, the return type is _patch[Any].
+        # Ideally we'd be able to add an overload for it so that the return type is _patch[MagicMock],
+        # but that's impossible with the current type system.
+        @overload
+        def __call__(
+            self,
+            target: Any,
+            new: _T,
+            spec: Optional[Any] = ...,
+            create: bool = ...,
+            spec_set: Optional[Any] = ...,
+            autospec: Optional[Any] = ...,
+            new_callable: Optional[Any] = ...,
+            **kwargs: Any,
+        ) -> _patch[_T]: ...
+    else:
+        @overload
+        def __call__(  # type: ignore
+            self,
+            target: Any,
+            *,
+            spec: Optional[Any] = ...,
+            create: bool = ...,
+            spec_set: Optional[Any] = ...,
+            autospec: Optional[Any] = ...,
+            new_callable: Optional[Any] = ...,
+            **kwargs: Any,
+        ) -> _patch[MagicMock]: ...
+        @overload
+        def __call__(
+            self,
+            target: Any,
+            new: _T,
+            spec: Optional[Any] = ...,
+            create: bool = ...,
+            spec_set: Optional[Any] = ...,
+            autospec: Optional[Any] = ...,
+            new_callable: Optional[Any] = ...,
+            **kwargs: Any,
+        ) -> _patch[_T]: ...
+    if sys.version_info >= (3, 8):
+        @overload
+        def object(  # type: ignore
+            self,
+            target: Any,
+            attribute: str,
+            *,
+            spec: Optional[Any] = ...,
+            create: bool = ...,
+            spec_set: Optional[Any] = ...,
+            autospec: Optional[Any] = ...,
+            new_callable: Optional[Any] = ...,
+            **kwargs: Any,
+        ) -> _patch[Union[MagicMock, AsyncMock]]: ...
+        @overload
+        def object(
+            self,
+            target: Any,
+            attribute: str,
+            new: _T = ...,
+            spec: Optional[Any] = ...,
+            create: bool = ...,
+            spec_set: Optional[Any] = ...,
+            autospec: Optional[Any] = ...,
+            new_callable: Optional[Any] = ...,
+            **kwargs: Any,
+        ) -> _patch[_T]: ...
+    else:
+        @overload
+        def object(  # type: ignore
+            self,
+            target: Any,
+            attribute: str,
+            *,
+            spec: Optional[Any] = ...,
+            create: bool = ...,
+            spec_set: Optional[Any] = ...,
+            autospec: Optional[Any] = ...,
+            new_callable: Optional[Any] = ...,
+            **kwargs: Any,
+        ) -> _patch[MagicMock]: ...
+        @overload
+        def object(
+            self,
+            target: Any,
+            attribute: str,
+            new: _T = ...,
+            spec: Optional[Any] = ...,
+            create: bool = ...,
+            spec_set: Optional[Any] = ...,
+            autospec: Optional[Any] = ...,
+            new_callable: Optional[Any] = ...,
+            **kwargs: Any,
+        ) -> _patch[_T]: ...
     def multiple(
         self,
         target: Any,
@@ -298,7 +380,23 @@ class MagicMock(MagicMixin, Mock):
     def mock_add_spec(self, spec: Any, spec_set: bool = ...) -> None: ...
 
 if sys.version_info >= (3, 8):
-    AsyncMock = Any
+    class AsyncMockMixin(Base):
+        def __init__(self, *args: Any, **kwargs: Any) -> None: ...
+        async def _execute_mock_call(self, *args: Any, **kwargs: Any) -> Any: ...
+        def assert_awaited(self) -> None: ...
+        def assert_awaited_once(self) -> None: ...
+        def assert_awaited_with(self, *args: Any, **kwargs: Any) -> None: ...
+        def assert_awaited_once_with(self, *args: Any, **kwargs: Any) -> None: ...
+        def assert_any_await(self, *args: Any, **kwargs: Any) -> None: ...
+        def assert_has_awaits(self, calls: _CallList, any_order: bool = ...) -> None: ...
+        def assert_not_awaited(self) -> None: ...
+        def reset_mock(self, *args, **kwargs) -> None: ...
+        await_count: int
+        await_args: Optional[_Call]
+        await_args_list: _CallList
+    class AsyncMagicMixin(MagicMixin):
+        def __init__(self, *args: Any, **kw: Any) -> None: ...
+    class AsyncMock(AsyncMockMixin, AsyncMagicMixin, Mock): ...
 
 class MagicProxy:
     name: Any
diff --git a/third_party/2and3/mock.pyi b/third_party/2and3/mock.pyi
index cdaec7d97f0a..013a22a2d570 100644
--- a/third_party/2and3/mock.pyi
+++ b/third_party/2and3/mock.pyi
@@ -164,35 +164,63 @@ class _patch(Generic[_T]):
     autospec: Any
     kwargs: Mapping[str, Any]
     additional_patchers: Any
-    @overload
-    def __init__(
-        self: _patch[MagicMock],
-        getter: Callable[[], Any],
-        attribute: str,
-        *,
-        spec: Optional[Any],
-        create: bool,
-        spec_set: Optional[Any],
-        autospec: Optional[Any],
-        new_callable: Optional[Any],
-        kwargs: Mapping[str, Any],
-    ) -> None: ...
-    # This overload also covers the case, where new==DEFAULT. In this case, self is _patch[Any].
-    # Ideally we'd be able to add an overload for it so that self is _patch[MagicMock],
-    # but that's impossible with the current type system.
-    @overload
-    def __init__(
-        self: _patch[_T],
-        getter: Callable[[], Any],
-        attribute: str,
-        new: _T,
-        spec: Optional[Any],
-        create: bool,
-        spec_set: Optional[Any],
-        autospec: Optional[Any],
-        new_callable: Optional[Any],
-        kwargs: Mapping[str, Any],
-    ) -> None: ...
+    if sys.version_info >= (3, 8):
+        @overload
+        def __init__(
+            self: _patch[Union[MagicMock, AsyncMock]],
+            getter: Callable[[], Any],
+            attribute: str,
+            *,
+            spec: Optional[Any],
+            create: bool,
+            spec_set: Optional[Any],
+            autospec: Optional[Any],
+            new_callable: Optional[Any],
+            kwargs: Mapping[str, Any],
+        ) -> None: ...
+        # This overload also covers the case, where new==DEFAULT. In this case, self is _patch[Any].
+        # Ideally we'd be able to add an overload for it so that self is _patch[MagicMock],
+        # but that's impossible with the current type system.
+        @overload
+        def __init__(
+            self: _patch[_T],
+            getter: Callable[[], Any],
+            attribute: str,
+            new: _T,
+            spec: Optional[Any],
+            create: bool,
+            spec_set: Optional[Any],
+            autospec: Optional[Any],
+            new_callable: Optional[Any],
+            kwargs: Mapping[str, Any],
+        ) -> None: ...
+    else:
+        @overload
+        def __init__(
+            self: _patch[MagicMock],
+            getter: Callable[[], Any],
+            attribute: str,
+            *,
+            spec: Optional[Any],
+            create: bool,
+            spec_set: Optional[Any],
+            autospec: Optional[Any],
+            new_callable: Optional[Any],
+            kwargs: Mapping[str, Any],
+        ) -> None: ...
+        @overload
+        def __init__(
+            self: _patch[_T],
+            getter: Callable[[], Any],
+            attribute: str,
+            new: _T,
+            spec: Optional[Any],
+            create: bool,
+            spec_set: Optional[Any],
+            autospec: Optional[Any],
+            new_callable: Optional[Any],
+            kwargs: Mapping[str, Any],
+        ) -> None: ...
     def copy(self) -> _patch[_T]: ...
     def __call__(self, func: Callable[..., _R]) -> Callable[..., _R]: ...
     def decorate_class(self, klass: _TT) -> _TT: ...
@@ -221,59 +249,113 @@ class _patch_dict:
 class _patcher:
     TEST_PREFIX: str
     dict: Type[_patch_dict]
-    @overload
-    def __call__(  # type: ignore
-        self,
-        target: Any,
-        *,
-        spec: Optional[Any] = ...,
-        create: bool = ...,
-        spec_set: Optional[Any] = ...,
-        autospec: Optional[Any] = ...,
-        new_callable: Optional[Any] = ...,
-        **kwargs: Any,
-    ) -> _patch[MagicMock]: ...
-    # This overload also covers the case, where new==DEFAULT. In this case, the return type is _patch[Any].
-    # Ideally we'd be able to add an overload for it so that the return type is _patch[MagicMock],
-    # but that's impossible with the current type system.
-    @overload
-    def __call__(
-        self,
-        target: Any,
-        new: _T,
-        spec: Optional[Any] = ...,
-        create: bool = ...,
-        spec_set: Optional[Any] = ...,
-        autospec: Optional[Any] = ...,
-        new_callable: Optional[Any] = ...,
-        **kwargs: Any,
-    ) -> _patch[_T]: ...
-    @overload
-    def object(  # type: ignore
-        self,
-        target: Any,
-        attribute: Text,
-        *,
-        spec: Optional[Any] = ...,
-        create: bool = ...,
-        spec_set: Optional[Any] = ...,
-        autospec: Optional[Any] = ...,
-        new_callable: Optional[Any] = ...,
-        **kwargs: Any,
-    ) -> _patch[MagicMock]: ...
-    @overload
-    def object(
-        self,
-        target: Any,
-        attribute: Text,
-        new: _T = ...,
-        spec: Optional[Any] = ...,
-        create: bool = ...,
-        spec_set: Optional[Any] = ...,
-        autospec: Optional[Any] = ...,
-        new_callable: Optional[Any] = ...,
-        **kwargs: Any,
-    ) -> _patch[_T]: ...
+    if sys.version_info >= (3, 8):
+        @overload
+        def __call__(  # type: ignore
+            self,
+            target: Any,
+            *,
+            spec: Optional[Any] = ...,
+            create: bool = ...,
+            spec_set: Optional[Any] = ...,
+            autospec: Optional[Any] = ...,
+            new_callable: Optional[Any] = ...,
+            **kwargs: Any,
+        ) -> _patch[Union[MagicMock, AsyncMock]]: ...
+        # This overload also covers the case, where new==DEFAULT. In this case, the return type is _patch[Any].
+        # Ideally we'd be able to add an overload for it so that the return type is _patch[MagicMock],
+        # but that's impossible with the current type system.
+        @overload
+        def __call__(
+            self,
+            target: Any,
+            new: _T,
+            spec: Optional[Any] = ...,
+            create: bool = ...,
+            spec_set: Optional[Any] = ...,
+            autospec: Optional[Any] = ...,
+            new_callable: Optional[Any] = ...,
+            **kwargs: Any,
+        ) -> _patch[_T]: ...
+    else:
+        @overload
+        def __call__(  # type: ignore
+            self,
+            target: Any,
+            *,
+            spec: Optional[Any] = ...,
+            create: bool = ...,
+            spec_set: Optional[Any] = ...,
+            autospec: Optional[Any] = ...,
+            new_callable: Optional[Any] = ...,
+            **kwargs: Any,
+        ) -> _patch[MagicMock]: ...
+        @overload
+        def __call__(
+            self,
+            target: Any,
+            new: _T,
+            spec: Optional[Any] = ...,
+            create: bool = ...,
+            spec_set: Optional[Any] = ...,
+            autospec: Optional[Any] = ...,
+            new_callable: Optional[Any] = ...,
+            **kwargs: Any,
+        ) -> _patch[_T]: ...
+    if sys.version_info >= (3, 8):
+        @overload
+        def object(  # type: ignore
+            self,
+            target: Any,
+            attribute: Text,
+            *,
+            spec: Optional[Any] = ...,
+            create: bool = ...,
+            spec_set: Optional[Any] = ...,
+            autospec: Optional[Any] = ...,
+            new_callable: Optional[Any] = ...,
+            **kwargs: Any,
+        ) -> _patch[Union[MagicMock, AsyncMock]]: ...
+        @overload
+        def object(
+            self,
+            target: Any,
+            attribute: Text,
+            new: _T = ...,
+            spec: Optional[Any] = ...,
+            create: bool = ...,
+            spec_set: Optional[Any] = ...,
+            autospec: Optional[Any] = ...,
+            new_callable: Optional[Any] = ...,
+            **kwargs: Any,
+        ) -> _patch[_T]: ...
+    else:
+        @overload
+        def object(  # type: ignore
+            self,
+            target: Any,
+            attribute: Text,
+            *,
+            spec: Optional[Any] = ...,
+            create: bool = ...,
+            spec_set: Optional[Any] = ...,
+            autospec: Optional[Any] = ...,
+            new_callable: Optional[Any] = ...,
+            **kwargs: Any,
+        ) -> _patch[MagicMock]: ...
+        @overload
+        def object(
+            self,
+            target: Any,
+            attribute: Text,
+            new: _T = ...,
+            spec: Optional[Any] = ...,
+            create: bool = ...,
+            spec_set: Optional[Any] = ...,
+            autospec: Optional[Any] = ...,
+            new_callable: Optional[Any] = ...,
+            **kwargs: Any,
+        ) -> _patch[_T]: ...
     def multiple(
         self,
         target: Any,
@@ -298,7 +380,23 @@ class MagicMock(MagicMixin, Mock):
     def mock_add_spec(self, spec: Any, spec_set: bool = ...) -> None: ...
 
 if sys.version_info >= (3, 8):
-    AsyncMock = Any
+    class AsyncMockMixin(Base):
+        def __init__(self, *args: Any, **kwargs: Any) -> None: ...
+        async def _execute_mock_call(self, *args: Any, **kwargs: Any) -> Any: ...
+        def assert_awaited(self) -> None: ...
+        def assert_awaited_once(self) -> None: ...
+        def assert_awaited_with(self, *args: Any, **kwargs: Any) -> None: ...
+        def assert_awaited_once_with(self, *args: Any, **kwargs: Any) -> None: ...
+        def assert_any_await(self, *args: Any, **kwargs: Any) -> None: ...
+        def assert_has_awaits(self, calls: _CallList, any_order: bool = ...) -> None: ...
+        def assert_not_awaited(self) -> None: ...
+        def reset_mock(self, *args, **kwargs) -> None: ...
+        await_count: int
+        await_args: Optional[_Call]
+        await_args_list: _CallList
+    class AsyncMagicMixin(MagicMixin):
+        def __init__(self, *args: Any, **kw: Any) -> None: ...
+    class AsyncMock(AsyncMockMixin, AsyncMagicMixin, Mock): ...
 
 class MagicProxy:
     name: Any