diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/conditionalImports.py b/python/testData/inspections/PyUnresolvedReferencesInspection/ConditionalImports/a.py
similarity index 100%
rename from python/testData/inspections/PyUnresolvedReferencesInspection/conditionalImports.py
rename to python/testData/inspections/PyUnresolvedReferencesInspection/ConditionalImports/a.py
diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/lib1.py b/python/testData/inspections/PyUnresolvedReferencesInspection/ConditionalImports/lib1.py
similarity index 100%
rename from python/testData/inspections/PyUnresolvedReferencesInspection/lib1.py
rename to python/testData/inspections/PyUnresolvedReferencesInspection/ConditionalImports/lib1.py
diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/lib2.py b/python/testData/inspections/PyUnresolvedReferencesInspection/ConditionalImports/lib2.py
similarity index 100%
rename from python/testData/inspections/PyUnresolvedReferencesInspection/lib2.py
rename to python/testData/inspections/PyUnresolvedReferencesInspection/ConditionalImports/lib2.py
diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/__init__.py b/python/testData/inspections/PyUnresolvedReferencesInspection/FromImportToContainingFile/p1/__init__.py
similarity index 100%
rename from python/testData/inspections/PyUnresolvedReferencesInspection/__init__.py
rename to python/testData/inspections/PyUnresolvedReferencesInspection/FromImportToContainingFile/p1/__init__.py
diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/FromImportToContainingFile/p1/m1.py b/python/testData/inspections/PyUnresolvedReferencesInspection/FromImportToContainingFile/p1/m1.py
new file mode 100644
index 000000000000..8ee0648f3b13
--- /dev/null
+++ b/python/testData/inspections/PyUnresolvedReferencesInspection/FromImportToContainingFile/p1/m1.py
@@ -0,0 +1,6 @@
+from p1 import <warning descr="Import resolves to its containing file">m1</warning>
+
+def foo():
+    pass
+
+m1.foo()
diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/FromImportToContainingFile2/p1/__init__.py b/python/testData/inspections/PyUnresolvedReferencesInspection/FromImportToContainingFile2/p1/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/FromImportToContainingFile2/p1/m1.py b/python/testData/inspections/PyUnresolvedReferencesInspection/FromImportToContainingFile2/p1/m1.py
new file mode 100644
index 000000000000..e995372f78b8
--- /dev/null
+++ b/python/testData/inspections/PyUnresolvedReferencesInspection/FromImportToContainingFile2/p1/m1.py
@@ -0,0 +1,4 @@
+<warning descr="Unused import statement">from <warning descr="Import resolves to its containing file">m1</warning> import xyzzy</warning>
+
+def xyzzy():
+    pass
diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/FromPackageImportBuiltin/a.py b/python/testData/inspections/PyUnresolvedReferencesInspection/FromPackageImportBuiltin/a.py
new file mode 100644
index 000000000000..60da4c200eb9
--- /dev/null
+++ b/python/testData/inspections/PyUnresolvedReferencesInspection/FromPackageImportBuiltin/a.py
@@ -0,0 +1 @@
+from importSource import <warning descr="Unresolved reference 'len'">len</warning>
diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/FromPackageImportBuiltin/importSource/__init__.py b/python/testData/inspections/PyUnresolvedReferencesInspection/FromPackageImportBuiltin/importSource/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/ImportToContainingFile/p1/__init__.py b/python/testData/inspections/PyUnresolvedReferencesInspection/ImportToContainingFile/p1/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/ImportToContainingFile/p1/m1.py b/python/testData/inspections/PyUnresolvedReferencesInspection/ImportToContainingFile/p1/m1.py
new file mode 100644
index 000000000000..375a2fc68efe
--- /dev/null
+++ b/python/testData/inspections/PyUnresolvedReferencesInspection/ImportToContainingFile/p1/m1.py
@@ -0,0 +1,6 @@
+import <warning descr="Import resolves to its containing file">p1.m1</warning>
+
+def foo():
+    pass
+
+p1.m1.foo()
diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/fromImportToContainingFile.py b/python/testData/inspections/PyUnresolvedReferencesInspection/fromImportToContainingFile.py
deleted file mode 100644
index 1663317e1abe..000000000000
--- a/python/testData/inspections/PyUnresolvedReferencesInspection/fromImportToContainingFile.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from PyUnresolvedReferencesInspection import <warning descr="Import resolves to its containing file">fromImportToContainingFile</warning>
-
-def foo(): pass
-
-fromImportToContainingFile.foo()
diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/fromImportToContainingFile2.py b/python/testData/inspections/PyUnresolvedReferencesInspection/fromImportToContainingFile2.py
deleted file mode 100644
index f55faaef3cee..000000000000
--- a/python/testData/inspections/PyUnresolvedReferencesInspection/fromImportToContainingFile2.py
+++ /dev/null
@@ -1,3 +0,0 @@
-<warning descr="Unused import statement">from <warning descr="Import resolves to its containing file">fromImportToContainingFile2</warning> import xyzzy</warning>
-
-def xyzzy(): pass
diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/importToContainingFile.py b/python/testData/inspections/PyUnresolvedReferencesInspection/importToContainingFile.py
deleted file mode 100644
index 10ddb31d5ebb..000000000000
--- a/python/testData/inspections/PyUnresolvedReferencesInspection/importToContainingFile.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import <warning descr="Import resolves to its containing file">PyUnresolvedReferencesInspection.importToContainingFile</warning>
-
-def foo(): pass
-
-PyUnresolvedReferencesInspection.importToContainingFile.foo()
diff --git a/python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java b/python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java
index b74ba65d5de4..96ea9e7e69a3 100644
--- a/python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java
+++ b/python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java
@@ -1,6 +1,7 @@
 package com.jetbrains.python.inspections;
 
 import com.jetbrains.python.fixtures.PyTestCase;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author yole
@@ -45,11 +46,7 @@ public class PyUnresolvedReferencesInspectionTest extends PyTestCase {
   }
 
   public void testConditionalImports() { // PY-983
-    myFixture.configureByFiles(TEST_DIRECTORY + getTestName(true) + ".py",
-                               TEST_DIRECTORY + "lib1.py",
-                               TEST_DIRECTORY + "lib2.py");
-    myFixture.enableInspections(PyUnresolvedReferencesInspection.class);
-    myFixture.checkHighlighting(true, false, false);
+    doMultiFileTest("a.py");
   }
 
   public void testHasattrGuard() { // PY-2309
@@ -86,15 +83,15 @@ public class PyUnresolvedReferencesInspectionTest extends PyTestCase {
   }
 
   public void testImportToContainingFile() {  // PY-4372
-    doMultiFileTest();
+    doMultiFileTest("p1/m1.py");
   }
 
   public void testFromImportToContainingFile() {  // PY-4371
-    doMultiFileTest();
+    doMultiFileTest("p1/m1.py");
   }
 
   public void testFromImportToContainingFile2() {  // PY-5945
-    doMultiFileTest();
+    doMultiFileTest("p1/m1.py");
   }
 
   public void testPropertyType() {  // PY-5915
@@ -110,20 +107,8 @@ public class PyUnresolvedReferencesInspectionTest extends PyTestCase {
     doTest();
   }
 
-  private void doMultiFileTest() {
-    myFixture.copyFileToProject("inspections/PyUnresolvedReferencesInspection/__init__.py", "PyUnresolvedReferencesInspection/__init__.py");
-    myFixture.copyFileToProject("inspections/PyUnresolvedReferencesInspection/" + getTestName(true) + ".py",
-                                "PyUnresolvedReferencesInspection/" + getTestName(true) + ".py");
-    myFixture.configureFromTempProjectFile("PyUnresolvedReferencesInspection/" + getTestName(true) + ".py");
-    myFixture.enableInspections(PyUnresolvedReferencesInspection.class);
-    myFixture.checkHighlighting(true, false, false);
-  }
-
   public void testFromPackageImportBuiltin() {
-    myFixture.copyDirectoryToProject("inspections/PyUnresolvedReferencesInspection/fromPackageImportBuiltin", "");
-    myFixture.configureFromTempProjectFile("fromPackageImportBuiltin.py");
-    myFixture.enableInspections(PyUnresolvedReferencesInspection.class);
-    myFixture.checkHighlighting(true, false, false);
+    doMultiFileTest("a.py");
   }
 
   private void doTest() {
@@ -131,4 +116,12 @@ public class PyUnresolvedReferencesInspectionTest extends PyTestCase {
     myFixture.enableInspections(PyUnresolvedReferencesInspection.class);
     myFixture.checkHighlighting(true, false, false);
   }
+
+  private void doMultiFileTest(@NotNull String filename) {
+    final String testName = getTestName(false);
+    myFixture.copyDirectoryToProject(TEST_DIRECTORY + testName, "");
+    myFixture.configureFromTempProjectFile(filename);
+    myFixture.enableInspections(PyUnresolvedReferencesInspection.class);
+    myFixture.checkHighlighting(true, false, false);
+  }
 }