diff --git a/stdlib/2and3/threading.pyi b/stdlib/2and3/threading.pyi
index 2bcf8a73e..8218ef7fd 100644
--- a/stdlib/2and3/threading.pyi
+++ b/stdlib/2and3/threading.pyi
@@ -40,10 +40,10 @@ if sys.version_info >= (3,):
 class ThreadError(Exception): ...
 
 
-# TODO: Change to a class with __getattr__ and __setattr__
-# once mypy supports universal __setattr__.
-# See https://github.com/python/mypy/issues/521
-local = ...  # type: Any
+class local(object):
+    def __getattribute__(self, name: str) -> Any: ...
+    def __setattr__(self, name: str, value: Any) -> None: ...
+    def __delattr__(self, name: str) -> None: ...
 
 
 class Thread: