diff --git a/jedi/evaluate/representation.py b/jedi/evaluate/representation.py
index 16dab7fb..30d4c404 100644
--- a/jedi/evaluate/representation.py
+++ b/jedi/evaluate/representation.py
@@ -445,6 +445,9 @@ class Class(use_metaclass(CachedMetaClass, Wrapper)):
     def py__getattribute__(self, name):
         return self._evaluator.find_types(self, name)
 
+    def py__class__(self, evaluator):
+        return compiled.builtin.get_by_name('type')
+
     @property
     def params(self):
         return self.get_subscope_by_name('__init__').params
diff --git a/test/completion/stdlib.py b/test/completion/stdlib.py
index 94611095..280bee43 100644
--- a/test/completion/stdlib.py
+++ b/test/completion/stdlib.py
@@ -61,6 +61,9 @@ import math
 import os
 #? type(os)
 type(math)
+class X(): pass
+#? type
+type(X)
 
 # -----------------
 # re