diff --git a/python/src/com/jetbrains/python/highlighting/PythonColorsPage.java b/python/src/com/jetbrains/python/highlighting/PythonColorsPage.java
index e9cb43405ea1..145327078729 100644
--- a/python/src/com/jetbrains/python/highlighting/PythonColorsPage.java
+++ b/python/src/com/jetbrains/python/highlighting/PythonColorsPage.java
@@ -118,7 +118,7 @@ public class PythonColorsPage implements ColorSettingsPage, InspectionColorSetti
       "    <docComment>\"\"\" Syntax Highlighting Demo\n" +
       "        <docCommentTag>@param</docCommentTag> x Parameter\"\"\"</docComment>\n" +
       "    s = (\"Test\", 2+3, {'a': 'b'}, <param>x</param>)   # Comment\n" +
-      "    print s[0].<mcall>lower()</mcall>\n"+
+      "    <call>f</call>(s[0].<mcall>lower()</mcall>)\n"+
       "\n"+
       "class <classDef>Foo</classDef>:\n"+
       "    tags: <annotation>List[<builtin>str</builtin>]</annotation>\n" +
@@ -130,7 +130,7 @@ public class PythonColorsPage implements ColorSettingsPage, InspectionColorSetti
       "    def <funcDef>makeSense</funcDef>(<self>self</self>, <param>whatever</param>):\n"+
       "        <self>self</self>.sense = <param>whatever</param>\n"+
       "\n"+
-      "x = <builtin><call>len</call></builtin>('abc')\n"+
+      "x = <builtin>len</builtin>('abc')\n"+
       "print(f.<predefinedUsage>__doc__</predefinedUsage>)"
     ;
   }
diff --git a/python/src/com/jetbrains/python/validation/HighlightingAnnotator.java b/python/src/com/jetbrains/python/validation/HighlightingAnnotator.java
index 1dadf823d2ca..15159326d0ac 100644
--- a/python/src/com/jetbrains/python/validation/HighlightingAnnotator.java
+++ b/python/src/com/jetbrains/python/validation/HighlightingAnnotator.java
@@ -22,6 +22,7 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.jetbrains.python.PyTokenTypes;
 import com.jetbrains.python.highlighting.PyHighlighter;
 import com.jetbrains.python.psi.*;
+import com.jetbrains.python.psi.impl.PyBuiltinCache;
 
 import static com.jetbrains.python.psi.PyUtil.as;
 
@@ -65,6 +66,9 @@ public class HighlightingAnnotator extends PyAnnotator {
   public void visitPyCallExpression(PyCallExpression node) {
     final PyReferenceExpression callee = as(node.getCallee(), PyReferenceExpression.class);
     if (callee != null) {
+      if (!callee.isQualified() && PyBuiltinCache.isInBuiltins(callee)) {
+        return;
+      }
       final ASTNode functionName = callee.getNameElement();
       if (functionName != null) {
         final TextAttributesKey attrKey = callee.isQualified() ? PyHighlighter.PY_METHOD_CALL : PyHighlighter.PY_FUNCTION_CALL;
diff --git a/python/testData/highlighting/builtins.py b/python/testData/highlighting/builtins.py
index c1a20fae3f83..36aa74f6fe8c 100644
--- a/python/testData/highlighting/builtins.py
+++ b/python/testData/highlighting/builtins.py
@@ -5,7 +5,7 @@
 # predefined decl: green bold
 # predefined usage: yellow bold
 
-<info descr="PY.BUILTIN_NAME" type="INFORMATION" foreground="0x00ff00" background="0x000000" effectcolor="0xffffff" effecttype="BOXED" fonttype="1"><info descr="PY.FUNCTION_CALL">len</info></info>("")
+<info descr="PY.BUILTIN_NAME" type="INFORMATION" foreground="0x00ff00" background="0x000000" effectcolor="0xffffff" effecttype="BOXED" fonttype="1">len</info>("")
 len = [] # redefine
 len # no highlight
 
diff --git a/python/testData/highlighting/functionCalls.py b/python/testData/highlighting/functionCalls.py
index cbb67c136f29..cc50758754fe 100644
--- a/python/testData/highlighting/functionCalls.py
+++ b/python/testData/highlighting/functionCalls.py
@@ -2,4 +2,4 @@
 mod.Class.<info descr="PY.METHOD_CALL">method</info>()
 <info descr="PY.FUNCTION_CALL">chained</info>().<info descr="PY.METHOD_CALL">calls</info>().<info descr="PY.METHOD_CALL">sample</info>()
 (foo or bar)()
-<info descr="PY.BUILTIN_NAME"><info descr="PY.FUNCTION_CALL">len</info></info>(xs)
\ No newline at end of file
+<info descr="PY.BUILTIN_NAME">len</info>(xs)
\ No newline at end of file
diff --git a/python/testData/highlighting/parametersWithAnnotationsAndDefaults.py b/python/testData/highlighting/parametersWithAnnotationsAndDefaults.py
index a2541d38ef7a..fbbeed0f8571 100644
--- a/python/testData/highlighting/parametersWithAnnotationsAndDefaults.py
+++ b/python/testData/highlighting/parametersWithAnnotationsAndDefaults.py
@@ -1,2 +1,2 @@
 def <info descr="PY.FUNC_DEFINITION">f</info>(<info descr="PY.PARAMETER">p1</info>: <info descr="PY.ANNOTATION"><info descr="PY.BUILTIN_NAME">int</info></info>, <info descr="PY.PARAMETER">p2</info>: <info descr="PY.ANNOTATION"><info descr="PY.BUILTIN_NAME">int</info></info> = 42):
-    <info descr="PY.BUILTIN_NAME"><info descr="PY.FUNCTION_CALL">print</info></info>(<info descr="PY.PARAMETER">p1</info>, <info descr="PY.PARAMETER">p2</info>)
\ No newline at end of file
+    <info descr="PY.BUILTIN_NAME">print</info>(<info descr="PY.PARAMETER">p1</info>, <info descr="PY.PARAMETER">p2</info>)
\ No newline at end of file