diff --git a/python/psi-api/src/com/jetbrains/python/PyNames.java b/python/psi-api/src/com/jetbrains/python/PyNames.java
index b9da047eb27a..2fabb81f95e6 100644
--- a/python/psi-api/src/com/jetbrains/python/PyNames.java
+++ b/python/psi-api/src/com/jetbrains/python/PyNames.java
@@ -347,6 +347,7 @@ public class PyNames {
     .putAll(BuiltinMethods)
     .put("__nonzero__", _only_self_descr)
     .put("__div__", _self_other_descr)
+    .put(NEXT, _only_self_descr)
     .build();
 
   public static ImmutableMap<String, BuiltinDescription> PY3_BUILTIN_METHODS = ImmutableMap.<String, BuiltinDescription>builder()
@@ -355,6 +356,7 @@ public class PyNames {
     .put("__bytes__", _only_self_descr)
     .put("__format__", new BuiltinDescription("(self, format_spec)"))
     .put("__round__", new BuiltinDescription("(self, n=None)"))
+    .put(DUNDER_NEXT, _only_self_descr)
     .build();
 
   public static ImmutableMap<String, BuiltinDescription> PY35_BUILTIN_METHODS = ImmutableMap.<String, BuiltinDescription>builder()
diff --git a/python/testData/completion/dunderNext.after.py b/python/testData/completion/dunderNext.after.py
new file mode 100644
index 000000000000..36118064132a
--- /dev/null
+++ b/python/testData/completion/dunderNext.after.py
@@ -0,0 +1,2 @@
+class C:
+    def __next__(self):
diff --git a/python/testData/completion/dunderNext.py b/python/testData/completion/dunderNext.py
new file mode 100644
index 000000000000..2b5c2a25bc44
--- /dev/null
+++ b/python/testData/completion/dunderNext.py
@@ -0,0 +1,2 @@
+class C:
+    def __nex<caret>
diff --git a/python/testData/completion/next.after.py b/python/testData/completion/next.after.py
new file mode 100644
index 000000000000..c232fb2c6928
--- /dev/null
+++ b/python/testData/completion/next.after.py
@@ -0,0 +1,2 @@
+class C:
+    def next(self):
diff --git a/python/testData/completion/next.py b/python/testData/completion/next.py
new file mode 100644
index 000000000000..cd2bca215367
--- /dev/null
+++ b/python/testData/completion/next.py
@@ -0,0 +1,2 @@
+class C:
+    def nex<caret>
diff --git a/python/testSrc/com/jetbrains/python/Py3CompletionTest.java b/python/testSrc/com/jetbrains/python/Py3CompletionTest.java
index ea154cb1084c..dfeb8c05b670 100644
--- a/python/testSrc/com/jetbrains/python/Py3CompletionTest.java
+++ b/python/testSrc/com/jetbrains/python/Py3CompletionTest.java
@@ -151,4 +151,9 @@ public class Py3CompletionTest extends PyTestCase {
       }
     });
   }
+
+  // PY-11214
+  public void testDunderNext() {
+    doTest();
+  }
 }
diff --git a/python/testSrc/com/jetbrains/python/PythonCompletionTest.java b/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
index fe379fea37ba..288384ee6dc3 100644
--- a/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
+++ b/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
@@ -770,4 +770,9 @@ public class PythonCompletionTest extends PyTestCase {
   public void testStructuralType() {
     doTest();
   }
+
+  // PY-11214
+  public void testNext() {
+    doTest();
+  }
 }