diff --git a/python/testData/pyi/resolve/fromPyiToClassInPy/FromPyiToClassInPy.pyi b/python/testData/pyi/resolve/fromPyiToClassInPy/FromPyiToClassInPy.pyi
new file mode 100644
index 000000000000..8e4e8d8126ec
--- /dev/null
+++ b/python/testData/pyi/resolve/fromPyiToClassInPy/FromPyiToClassInPy.pyi
@@ -0,0 +1,5 @@
+from m1 import C
+
+
+def f(x: C) -> None: ...
+#        <ref>
diff --git a/python/testData/pyi/resolve/fromPyiToClassInPy/m1.py b/python/testData/pyi/resolve/fromPyiToClassInPy/m1.py
new file mode 100644
index 000000000000..646b07aed7f4
--- /dev/null
+++ b/python/testData/pyi/resolve/fromPyiToClassInPy/m1.py
@@ -0,0 +1,2 @@
+class C:
+    pass
diff --git a/python/testSrc/com/jetbrains/python/pyi/PyiResolveTest.java b/python/testSrc/com/jetbrains/python/pyi/PyiResolveTest.java
index 818ca8ac3b94..dc9732b68823 100644
--- a/python/testSrc/com/jetbrains/python/pyi/PyiResolveTest.java
+++ b/python/testSrc/com/jetbrains/python/pyi/PyiResolveTest.java
@@ -35,4 +35,8 @@ public class PyiResolveTest extends PyMultiFileResolveTestCase {
   public void testBuiltinInt() {
     assertResolvesTo(PyClass.class, "int");
   }
+
+  public void testFromPyiToClassInPy() {
+    assertResolvesTo(PyClass.class, "C");
+  }
 }