diff --git a/python/testData/resolve/multiFile/circularImport/CircularImport.py b/python/testData/resolve/multiFile/circularImport/CircularImport.py
new file mode 100644
index 000000000000..8dad7d92efe2
--- /dev/null
+++ b/python/testData/resolve/multiFile/circularImport/CircularImport.py
@@ -0,0 +1,4 @@
+import x
+
+x.y.z.token
+#     <ref>
\ No newline at end of file
diff --git a/python/testData/resolve/multiFile/circularImport/x.py b/python/testData/resolve/multiFile/circularImport/x.py
new file mode 100644
index 000000000000..cd465e0f95ba
--- /dev/null
+++ b/python/testData/resolve/multiFile/circularImport/x.py
@@ -0,0 +1,2 @@
+import y
+X = "X"
\ No newline at end of file
diff --git a/python/testData/resolve/multiFile/circularImport/y.py b/python/testData/resolve/multiFile/circularImport/y.py
new file mode 100644
index 000000000000..cc608492b628
--- /dev/null
+++ b/python/testData/resolve/multiFile/circularImport/y.py
@@ -0,0 +1,3 @@
+import z
+
+Y="Y"
\ No newline at end of file
diff --git a/python/testData/resolve/multiFile/circularImport/z.py b/python/testData/resolve/multiFile/circularImport/z.py
new file mode 100644
index 000000000000..2cf303822a51
--- /dev/null
+++ b/python/testData/resolve/multiFile/circularImport/z.py
@@ -0,0 +1,3 @@
+import x
+token="Z"
+
diff --git a/python/testSrc/com/jetbrains/python/PyMultiFileResolveTest.java b/python/testSrc/com/jetbrains/python/PyMultiFileResolveTest.java
index e58b0673a4c4..5b2b7fff6521 100644
--- a/python/testSrc/com/jetbrains/python/PyMultiFileResolveTest.java
+++ b/python/testSrc/com/jetbrains/python/PyMultiFileResolveTest.java
@@ -89,14 +89,12 @@ public class PyMultiFileResolveTest extends CodeInsightTestCase {
     assertTrue(element instanceof PyFunction);
   }
 
-  /*
   // Currently fails due to inadequate stubs
   public void testCircularImport() throws Exception {
     PsiElement element = doResolve();
     assertTrue(element instanceof PyTargetExpression);
   }
-  */
-  
+
 
   private PsiElement doResolve() throws Exception {
     String testName = getTestName(true);