diff --git a/python/helpers/typeshed/stdlib/3.7/contextvars.pyi b/python/helpers/typeshed/stdlib/3.7/contextvars.pyi
new file mode 100644
index 000000000000..a90c2a8b5f65
--- /dev/null
+++ b/python/helpers/typeshed/stdlib/3.7/contextvars.pyi
@@ -0,0 +1,30 @@
+from typing import Any, Callable, ClassVar, Generic, Iterator, Mapping, TypeVar
+
+_T = TypeVar('_T')
+
+class ContextVar(Generic[_T]):
+    def __init__(self, name: str, *, default: _T = ...) -> None: ...
+    @property
+    def name(self) -> str: ...
+    def get(self, default: _T = ...) -> _T: ...
+    def set(self, value: _T) -> Token[_T]: ...
+    def reset(self, token: Token[_T]) -> None: ...
+
+class Token(Generic[_T]):
+    @property
+    def var(self) -> ContextVar[_T]: ...
+    @property
+    def old_value(self) -> Any: ...  # returns either _T or MISSING, but that's hard to express
+    MISSING: ClassVar[object]
+
+def copy_context() -> Context: ...
+
+# It doesn't make sense to make this generic, because for most Contexts each ContextVar will have
+# a different value.
+class Context(Mapping[ContextVar[Any], Any]):
+    def __init__(self) -> None: ...
+    def run(self, callable: Callable[..., _T], *args: Any, **kwargs: Any) -> _T: ...
+    def copy(self) -> Context: ...
+    def __getitem__(self, key: ContextVar[Any]) -> Any: ...
+    def __iter__(self) -> Iterator[ContextVar[Any]]: ...
+    def __len__(self) -> int: ...
diff --git a/python/helpers/typeshed/third_party/3/contextvars.pyi b/python/helpers/typeshed/third_party/3/contextvars.pyi
new file mode 100644
index 000000000000..a90c2a8b5f65
--- /dev/null
+++ b/python/helpers/typeshed/third_party/3/contextvars.pyi
@@ -0,0 +1,30 @@
+from typing import Any, Callable, ClassVar, Generic, Iterator, Mapping, TypeVar
+
+_T = TypeVar('_T')
+
+class ContextVar(Generic[_T]):
+    def __init__(self, name: str, *, default: _T = ...) -> None: ...
+    @property
+    def name(self) -> str: ...
+    def get(self, default: _T = ...) -> _T: ...
+    def set(self, value: _T) -> Token[_T]: ...
+    def reset(self, token: Token[_T]) -> None: ...
+
+class Token(Generic[_T]):
+    @property
+    def var(self) -> ContextVar[_T]: ...
+    @property
+    def old_value(self) -> Any: ...  # returns either _T or MISSING, but that's hard to express
+    MISSING: ClassVar[object]
+
+def copy_context() -> Context: ...
+
+# It doesn't make sense to make this generic, because for most Contexts each ContextVar will have
+# a different value.
+class Context(Mapping[ContextVar[Any], Any]):
+    def __init__(self) -> None: ...
+    def run(self, callable: Callable[..., _T], *args: Any, **kwargs: Any) -> _T: ...
+    def copy(self) -> Context: ...
+    def __getitem__(self, key: ContextVar[Any]) -> Any: ...
+    def __iter__(self) -> Iterator[ContextVar[Any]]: ...
+    def __len__(self) -> int: ...
diff --git a/python/tools/src/com/jetbrains/python/tools/PyTypeShedSync.kts b/python/tools/src/com/jetbrains/python/tools/PyTypeShedSync.kts
index f30969523142..61992d66c0b1 100644
--- a/python/tools/src/com/jetbrains/python/tools/PyTypeShedSync.kts
+++ b/python/tools/src/com/jetbrains/python/tools/PyTypeShedSync.kts
@@ -36,6 +36,7 @@ val whiteList = setOf(
   "builtins",
   "collections",
   "concurrent",
+  "contextvars",
   "cPickle",
   "crypt",
   "ctypes",