diff --git a/python/testData/typeshed/stdlib/2/builtins_test.py b/python/testData/typeshed/stdlib/2/builtins_test.py
index 548f10bdeb51..7b0f81b2eaf7 100644
--- a/python/testData/typeshed/stdlib/2/builtins_test.py
+++ b/python/testData/typeshed/stdlib/2/builtins_test.py
@@ -26,3 +26,137 @@ def test_zip():
     assert(list(zip([1], [2], [3], [4], [5], [6], [7], [8])) == [(1, 2, 3, 4, 5, 6, 7, 8)])
     assert(list(zip([1], [2], [3], [4], [5], [6], [7], [8], [9])) == [(1, 2, 3, 4, 5, 6, 7, 8, 9)])
     assert(list(zip([1], [2], [3], [4], [5], [6], [7], [8], [10])) == [(1, 2, 3, 4, 5, 6, 7, 8, 10)])
+
+
+def test_classmethod():
+    # test __init__
+    def a():
+        pass
+
+    assert isinstance(classmethod(a), classmethod)
+
+
+    # test __new__
+    def b():
+        pass
+
+
+    def c():
+        pass
+
+
+    def d():
+        pass
+
+
+    def e():
+        pass
+
+
+    assert isinstance(classmethod.__new__(classmethod, b, c, d=d, e=e), classmethod)
+
+
+    # test __func__
+    def f():
+        pass
+
+
+    assert classmethod(f).__func__ == f
+
+
+    # test __get__
+    class WrappedWithSM:
+        @classmethod
+        def foo(cls):
+            return 10
+
+
+    class ReassignedWithSM:
+        def foo(cls):
+            return 10
+        foo = classmethod(foo)
+
+
+    assert type(WrappedWithSM.__dict__["foo"].__get__(WrappedWithSM, type)).__name__ == "instancemethod"
+    assert type(WrappedWithSM.__dict__["foo"].__get__(WrappedWithSM)).__name__ == "instancemethod"
+    assert type(ReassignedWithSM.__dict__["foo"].__get__(ReassignedWithSM, type)).__name__ == "instancemethod"
+    assert type(ReassignedWithSM.__dict__["foo"].__get__(ReassignedWithSM)).__name__ == "instancemethod"
+
+
+    # test __getattribute__
+    def g():
+        pass
+
+
+    assert classmethod(g).__getattribute__("__func__") == g
+
+
+    # test __dict__.keys()
+    assert set(classmethod.__dict__.keys()) == {'__init__', '__new__', '__func__', '__get__', '__getattribute__', '__doc__'}
+
+
+def test_staticmethod():
+    # test __init__
+    def a():
+        pass
+
+    assert isinstance(staticmethod(a), staticmethod)
+
+
+    # test __new__
+    def b():
+        pass
+
+
+    def c():
+        pass
+
+
+    def d():
+        pass
+
+
+    def e():
+        pass
+
+
+    assert isinstance(staticmethod.__new__(staticmethod, b, c, d=d, e=e), staticmethod)
+
+
+    # test __func__
+    def f():
+        pass
+
+
+    assert staticmethod(f).__func__ == f
+
+
+    # test __get__
+    class WrappedWithSM:
+        @staticmethod
+        def foo():
+            return 10
+
+
+    class ReassignedWithSM:
+        def foo():
+            return 10
+        foo = staticmethod(foo)
+
+
+    assert type(WrappedWithSM.__dict__["foo"].__get__(WrappedWithSM, type)).__name__ == "function"
+    assert type(WrappedWithSM.__dict__["foo"].__get__(WrappedWithSM)).__name__ == "function"
+    assert type(ReassignedWithSM.__dict__["foo"].__get__(ReassignedWithSM, type)).__name__ == "function"
+    assert type(ReassignedWithSM.__dict__["foo"].__get__(ReassignedWithSM)).__name__ == "function"
+
+
+    # test __getattribute__
+    def g():
+        pass
+
+
+    assert staticmethod(g).__getattribute__("__func__") == g
+
+
+    # test __dict__.keys()
+    assert set(staticmethod.__dict__.keys()) == {'__init__', '__new__', '__func__', '__get__', '__getattribute__', '__doc__'}
diff --git a/python/testData/typeshed/stdlib/3/builtins_test.py b/python/testData/typeshed/stdlib/3/builtins_test.py
index e707d192a129..fdd493142fb9 100644
--- a/python/testData/typeshed/stdlib/3/builtins_test.py
+++ b/python/testData/typeshed/stdlib/3/builtins_test.py
@@ -20,4 +20,160 @@ def test_open_path_like():
                 return sys.argv[0]
 
         with open(A()) as f:
-            assert f.name == sys.argv[0]
\ No newline at end of file
+            assert f.name == sys.argv[0]
+
+
+def test_classmethod():
+    import abc
+
+
+    # test __init__
+    def a():
+        pass
+
+
+    assert isinstance(classmethod(a), classmethod)
+
+
+    # test __new__
+    def b():
+        pass
+
+
+    def c():
+        pass
+
+
+    def d():
+        pass
+
+
+    def e():
+        pass
+
+
+    assert isinstance(classmethod.__new__(classmethod, b, c, d=d, e=e), classmethod)
+
+
+    # test __func__
+    def f():
+        pass
+
+
+    assert classmethod(f).__func__ == f
+
+
+    # test __isabstractmethod__
+    @abc.abstractmethod
+    def g():
+        pass
+
+
+    def h():
+        pass
+
+
+    assert classmethod(g).__isabstractmethod__
+    assert not classmethod(h).__isabstractmethod__
+
+
+    # test __get__
+    class WrappedWithSM:
+        @classmethod
+        def foo(cls):
+            return 10
+
+
+    class ReassignedWithSM:
+        def foo(cls):
+            return 10
+        foo = classmethod(foo)
+
+
+    assert type(WrappedWithSM.__dict__["foo"].__get__(WrappedWithSM, type)).__name__ == "method"
+    assert type(WrappedWithSM.__dict__["foo"].__get__(WrappedWithSM)).__name__ == "method"
+    assert type(ReassignedWithSM.__dict__["foo"].__get__(ReassignedWithSM, type)).__name__ == "method"
+    assert type(ReassignedWithSM.__dict__["foo"].__get__(ReassignedWithSM)).__name__ == "method"
+
+
+    # test __dict__.keys()
+    assert set(classmethod.__dict__.keys()) == {'__init__', '__new__', '__func__', '__isabstractmethod__', '__get__',
+                                                 '__dict__', '__doc__'}
+
+
+def test_staticmethod():
+    import abc
+
+
+    # test __init__
+    def a():
+        pass
+
+
+    assert isinstance(staticmethod(a), staticmethod)
+
+
+    # test __new__
+    def b():
+        pass
+
+
+    def c():
+        pass
+
+
+    def d():
+        pass
+
+
+    def e():
+        pass
+
+
+    assert isinstance(staticmethod.__new__(staticmethod, b, c, d=d, e=e), staticmethod)
+
+
+    # test __func__
+    def f():
+        pass
+
+
+    assert staticmethod(f).__func__ == f
+
+
+    # test __isabstractmethod__
+    @abc.abstractmethod
+    def g():
+        pass
+
+
+    def h():
+        pass
+
+
+    assert staticmethod(g).__isabstractmethod__
+    assert not staticmethod(h).__isabstractmethod__
+
+
+    # test __get__
+    class WrappedWithSM:
+        @staticmethod
+        def foo():
+            return 10
+
+
+    class ReassignedWithSM:
+        def foo():
+            return 10
+        foo = staticmethod(foo)
+
+
+    assert type(WrappedWithSM.__dict__["foo"].__get__(WrappedWithSM, type)).__name__ == "function"
+    assert type(WrappedWithSM.__dict__["foo"].__get__(WrappedWithSM)).__name__ == "function"
+    assert type(ReassignedWithSM.__dict__["foo"].__get__(ReassignedWithSM, type)).__name__ == "function"
+    assert type(ReassignedWithSM.__dict__["foo"].__get__(ReassignedWithSM)).__name__ == "function"
+
+
+    # test __dict__.keys()
+    assert set(staticmethod.__dict__.keys()) == {'__init__', '__new__', '__func__', '__isabstractmethod__', '__get__',
+                                                 '__dict__', '__doc__'}
\ No newline at end of file