diff --git a/python/testData/completion/__init__.py b/python/testData/completion/py255/completion/__init__.py
similarity index 100%
rename from python/testData/completion/__init__.py
rename to python/testData/completion/py255/completion/__init__.py
diff --git a/python/testData/completion/mymodule/__init__.py b/python/testData/completion/py255/completion/mymodule/__init__.py
similarity index 100%
rename from python/testData/completion/mymodule/__init__.py
rename to python/testData/completion/py255/completion/mymodule/__init__.py
diff --git a/python/testData/completion/mymodule/mysubmodule/__init__.py b/python/testData/completion/py255/completion/mymodule/mysubmodule/__init__.py
similarity index 100%
rename from python/testData/completion/mymodule/mysubmodule/__init__.py
rename to python/testData/completion/py255/completion/mymodule/mysubmodule/__init__.py
diff --git a/python/testData/completion/moduleClass.after.py b/python/testData/completion/py255/moduleClass.after.py
similarity index 100%
rename from python/testData/completion/moduleClass.after.py
rename to python/testData/completion/py255/moduleClass.after.py
diff --git a/python/testData/completion/moduleClass.py b/python/testData/completion/py255/moduleClass.py
similarity index 100%
rename from python/testData/completion/moduleClass.py
rename to python/testData/completion/py255/moduleClass.py
diff --git a/python/testSrc/com/jetbrains/python/Py3CompletionTest.java b/python/testSrc/com/jetbrains/python/Py3CompletionTest.java
index dfeb8c05b670..64bdf670135e 100644
--- a/python/testSrc/com/jetbrains/python/Py3CompletionTest.java
+++ b/python/testSrc/com/jetbrains/python/Py3CompletionTest.java
@@ -40,7 +40,7 @@ public class Py3CompletionTest extends PyTestCase {
   }
 
   public void testNamedTuple() {
-    final String testName = "completion/" + getTestName(true);
+    final String testName = getTestName(true);
     myFixture.configureByFile(testName + ".py");
     myFixture.completeBasic();
     final List<String> strings = myFixture.getLookupElementStrings();
@@ -63,17 +63,17 @@ public class Py3CompletionTest extends PyTestCase {
 
   private void doTest() {
     CamelHumpMatcher.forceStartMatching(getTestRootDisposable());
-    final String testName = "completion/" + getTestName(true);
+    final String testName = getTestName(true);
     myFixture.configureByFile(testName + ".py");
     myFixture.completeBasic();
     myFixture.checkResultByFile(testName + ".after.py");
   }
 
   private void doMultiFileTest() {
-    myFixture.copyDirectoryToProject("completion/" + getTestName(true), "");
+    myFixture.copyDirectoryToProject(getTestName(true), "");
     myFixture.configureByFile("a.py");
     myFixture.completeBasic();
-    myFixture.checkResultByFile("completion/" + getTestName(true) + "/a.after.py");
+    myFixture.checkResultByFile(getTestName(true) + "/a.after.py");
   }
 
   private List<String> doTestByText(String text) {
@@ -131,10 +131,10 @@ public class Py3CompletionTest extends PyTestCase {
   }
 
   private void doMultiFileTestInsideNamespacePackage() {
-    myFixture.copyDirectoryToProject("completion/" + getTestName(true), "");
+    myFixture.copyDirectoryToProject(getTestName(true), "");
     myFixture.configureByFile("nspkg1/a.py");
     myFixture.completeBasic();
-    myFixture.checkResultByFile("completion/" + getTestName(true) + "/nspkg1/a.after.py");
+    myFixture.checkResultByFile(getTestName(true) + "/nspkg1/a.after.py");
   }
 
   // PY-14385
@@ -156,4 +156,9 @@ public class Py3CompletionTest extends PyTestCase {
   public void testDunderNext() {
     doTest();
   }
+
+  @Override
+  protected String getTestDataPath() {
+    return super.getTestDataPath() + "/completion";
+  }
 }
diff --git a/python/testSrc/com/jetbrains/python/PythonCompletionTest.java b/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
index 952126dcbfde..a7e1a643f72d 100644
--- a/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
+++ b/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
@@ -37,17 +37,17 @@ public class PythonCompletionTest extends PyTestCase {
 
   private void doTest() {
     CamelHumpMatcher.forceStartMatching(getTestRootDisposable());
-    final String testName = "completion/" + getTestName(true);
+    final String testName = getTestName(true);
     myFixture.configureByFile(testName + ".py");
     myFixture.completeBasic();
     myFixture.checkResultByFile(testName + ".after.py");
   }
 
   private void doMultiFileTest() {
-    myFixture.copyDirectoryToProject("completion/" + getTestName(true), "");
+    myFixture.copyDirectoryToProject(getTestName(true), "");
     myFixture.configureByFile("a.py");
     myFixture.completeBasic();
-    myFixture.checkResultByFile("completion/" + getTestName(true) + "/a.after.py");
+    myFixture.checkResultByFile(getTestName(true) + "/a.after.py");
   }
 
   private List<String> doTestByText(String text) {
@@ -58,14 +58,14 @@ public class PythonCompletionTest extends PyTestCase {
 
   @Nullable
   private List<String> doTestByFile() {
-    myFixture.configureByFile("completion/" + getTestName(true) + ".py");
+    myFixture.configureByFile(getTestName(true) + ".py");
     myFixture.completeBasic();
     return myFixture.getLookupElementStrings();
   }
 
   @Nullable
   private List<String> doTestSmartByFile() {
-    myFixture.configureByFile("completion/" + getTestName(true) + ".py");
+    myFixture.configureByFile(getTestName(true) + ".py");
     myFixture.complete(CompletionType.SMART);
     return myFixture.getLookupElementStrings();
   }
@@ -127,7 +127,7 @@ public class PythonCompletionTest extends PyTestCase {
   }
 
   public void testOneUnderscore() {
-    final String testName = "completion/" + getTestName(true);
+    final String testName = getTestName(true);
     myFixture.configureByFile(testName + ".py");
     myFixture.completeBasic();
     myFixture.type('\n');
@@ -179,7 +179,7 @@ public class PythonCompletionTest extends PyTestCase {
   }
 
   public void testSeenMembers() {  // PY-1181
-    final String testName = "completion/" + getTestName(true);
+    final String testName = getTestName(true);
     myFixture.configureByFile(testName + ".py");
     final LookupElement[] elements = myFixture.completeBasic();
     assertNotNull(elements);
@@ -188,26 +188,24 @@ public class PythonCompletionTest extends PyTestCase {
   }
 
   public void testImportModule() {
-    final String testName = "completion/" + getTestName(true);
-    myFixture.configureByFiles(testName + ".py", "completion/someModule.py");
+    final String testName = getTestName(true);
+    myFixture.configureByFiles(testName + ".py", "someModule.py");
     myFixture.completeBasic();
     myFixture.checkResultByFile(testName + ".after.py");
   }
 
   public void testPy255() {
-    final String dirname = "completion/";
-    final String testName = dirname + "moduleClass";
-    myFixture.configureByFiles(testName + ".py", dirname + "__init__.py");
-    myFixture.copyDirectoryToProject(dirname + "mymodule", dirname + "mymodule");
+    final String dirName = getTestName(true);
+    myFixture.copyDirectoryToProject(dirName, "");
+    myFixture.configureByFiles("moduleClass.py");
     myFixture.completeBasic();
-    myFixture.checkResultByFile(testName + ".after.py");
+    myFixture.checkResultByFile(dirName + "/moduleClass.after.py");
   }
 
   public void testPy874() {
-    final String dirname = "completion/";
-    final String testName = dirname + "py874";
+    final String testName = "py874";
     myFixture.configureByFile(testName + ".py");
-    myFixture.copyDirectoryToProject(dirname + "root", dirname + "root");
+    myFixture.copyDirectoryToProject("root", "root");
     myFixture.completeBasic();
     myFixture.checkResultByFile(testName + ".after.py");
   }
@@ -217,7 +215,7 @@ public class PythonCompletionTest extends PyTestCase {
   }
 
   public void testStarImport() {
-    myFixture.configureByFiles("completion/starImport/starImport.py", "completion/starImport/importSource.py");
+    myFixture.configureByFiles("starImport/starImport.py", "starImport/importSource.py");
     myFixture.completeBasic();
     assertSameElements(myFixture.getLookupElementStrings(), Arrays.asList("my_foo", "my_bar"));
   }
@@ -240,11 +238,11 @@ public class PythonCompletionTest extends PyTestCase {
   }
 
   public void testFromImportBinary() {
-    myFixture.copyFileToProject("completion/root/binary_mod.pyd");
-    myFixture.copyFileToProject("completion/root/binary_mod.so");
-    myFixture.configureByFiles("completion/fromImportBinary.py", "completion/root/__init__.py");
+    myFixture.copyFileToProject("root/binary_mod.pyd");
+    myFixture.copyFileToProject("root/binary_mod.so");
+    myFixture.configureByFiles("fromImportBinary.py", "root/__init__.py");
     myFixture.completeBasic();
-    myFixture.checkResultByFile("completion/fromImportBinary.after.py");
+    myFixture.checkResultByFile("fromImportBinary.after.py");
   }
 
   public void testNonExistingProperty() {  // PY-1748
@@ -252,26 +250,24 @@ public class PythonCompletionTest extends PyTestCase {
   }
 
   public void testImportItself() {  // PY-1895
-    myFixture.copyDirectoryToProject("completion/importItself/package1", "package1");
+    myFixture.copyDirectoryToProject("importItself/package1", "package1");
     myFixture.configureFromTempProjectFile("package1/submodule1.py");
     myFixture.completeBasic();
-    myFixture.checkResultByFile("completion/importItself.after.py");
+    myFixture.checkResultByFile("importItself.after.py");
   }
 
   public void testImportedFile() { // PY-1955
-    final String dirname = "completion/";
-    myFixture.copyDirectoryToProject(dirname + "root", dirname + "root");
-    myFixture.configureByFile(dirname + "importedFile.py");
+    myFixture.copyDirectoryToProject("root", "root");
+    myFixture.configureByFile("importedFile.py");
     myFixture.completeBasic();
-    myFixture.checkResultByFile(dirname + "importedFile.after.py");
+    myFixture.checkResultByFile("importedFile.after.py");
   }
 
   public void testImportedModule() {  // PY-1956
-    final String dirname = "completion/";
-    myFixture.copyDirectoryToProject(dirname + "root", dirname + "root");
-    myFixture.configureByFile(dirname + "importedModule.py");
+    myFixture.copyDirectoryToProject("root", "root");
+    myFixture.configureByFile("importedModule.py");
     myFixture.completeBasic();
-    myFixture.checkResultByFile(dirname + "importedModule.after.py");
+    myFixture.checkResultByFile("importedModule.after.py");
   }
 
   public void testDictKeys() {  // PY-2245
@@ -319,17 +315,17 @@ public class PythonCompletionTest extends PyTestCase {
   }
 
   public void testRelativeImport() {  // PY-2816
-    myFixture.copyDirectoryToProject("completion/relativeImport", "relativeImport");
+    myFixture.copyDirectoryToProject("relativeImport", "relativeImport");
     myFixture.configureByFile("relativeImport/pkg/main.py");
     myFixture.completeBasic();
-    myFixture.checkResultByFile("completion/relativeImport/pkg/main.after.py");
+    myFixture.checkResultByFile("relativeImport/pkg/main.after.py");
   }
 
   public void testRelativeImportNameFromInitPy() {  // PY-2816
-    myFixture.copyDirectoryToProject("completion/relativeImport", "relativeImport");
+    myFixture.copyDirectoryToProject("relativeImport", "relativeImport");
     myFixture.configureByFile("relativeImport/pkg/name.py");
     myFixture.completeBasic();
-    myFixture.checkResultByFile("completion/relativeImport/pkg/name.after.py");
+    myFixture.checkResultByFile("relativeImport/pkg/name.after.py");
   }
 
   public void testImport() {
@@ -375,7 +371,7 @@ public class PythonCompletionTest extends PyTestCase {
     final PyDocumentationSettings settings = PyDocumentationSettings.getInstance(myFixture.getModule());
     settings.setFormat(DocStringFormat.EPYTEXT);
     try {
-      myFixture.configureByFile("completion/epydocTags.py");
+      myFixture.configureByFile("epydocTags.py");
       myFixture.completeBasic();
       final List<String> lookupElementStrings = myFixture.getLookupElementStrings();
       assertNotNull(lookupElementStrings);
@@ -390,9 +386,9 @@ public class PythonCompletionTest extends PyTestCase {
     final PyDocumentationSettings settings = PyDocumentationSettings.getInstance(myFixture.getModule());
     settings.setFormat(DocStringFormat.EPYTEXT);
     try {
-      myFixture.configureByFile("completion/epydocTagsMiddle.py");
+      myFixture.configureByFile("epydocTagsMiddle.py");
       myFixture.completeBasic();
-      myFixture.checkResultByFile("completion/epydocTagsMiddle.after.py");
+      myFixture.checkResultByFile("epydocTagsMiddle.after.py");
     }
     finally {
       settings.setFormat(DocStringFormat.PLAIN);
@@ -402,7 +398,7 @@ public class PythonCompletionTest extends PyTestCase {
   public void testIdentifiersInPlainDocstring() {
     final PyDocumentationSettings settings = PyDocumentationSettings.getInstance(myFixture.getModule());
     settings.setFormat(DocStringFormat.PLAIN);
-    myFixture.configureByFile("completion/identifiersInPlainDocstring.py");
+    myFixture.configureByFile("identifiersInPlainDocstring.py");
     final LookupElement[] elements = myFixture.completeBasic();
     assertNotNull(elements);
     assertContainsElements(Lists.newArrayList(elements),
@@ -410,31 +406,31 @@ public class PythonCompletionTest extends PyTestCase {
   }
 
   public void testPep328Completion() {  // PY-3409
-    myFixture.copyDirectoryToProject("completion/pep328", "pep328");
+    myFixture.copyDirectoryToProject("pep328", "pep328");
     myFixture.configureByFile("pep328/package/subpackage1/moduleX.py");
     myFixture.completeBasic();
-    myFixture.checkResultByFile("completion/pep328/package/subpackage1/moduleX.after.py");
+    myFixture.checkResultByFile("pep328/package/subpackage1/moduleX.after.py");
   }
 
   public void testImportedSubmoduleCompletion() {  // PY-3227
-    myFixture.copyDirectoryToProject("completion/submodules", "submodules");
+    myFixture.copyDirectoryToProject("submodules", "submodules");
     myFixture.configureByFile("submodules/foo.py");
     myFixture.completeBasic();
-    myFixture.checkResultByFile("completion/submodules/foo.after.py");
+    myFixture.checkResultByFile("submodules/foo.after.py");
   }
 
   public void testFromImportedModuleCompletion() {  // PY-3595
-    myFixture.copyDirectoryToProject("completion/py3595", "");
+    myFixture.copyDirectoryToProject("py3595", "");
     myFixture.configureByFile("moduleX.py");
     myFixture.completeBasic();
-    myFixture.checkResultByFile("completion/py3595/moduleX.after.py");
+    myFixture.checkResultByFile("py3595/moduleX.after.py");
   }
 
   public void testExportedConstants() {  // PY-3658
-    myFixture.copyDirectoryToProject("completion/exportedConstants", "");
+    myFixture.copyDirectoryToProject("exportedConstants", "");
     myFixture.configureByFile("a.py");
     myFixture.completeBasic();
-    myFixture.checkResultByFile("completion/exportedConstants/a.after.py");
+    myFixture.checkResultByFile("exportedConstants/a.after.py");
   }
 
   public void testAlias() {  // PY-3672
@@ -517,7 +513,7 @@ public class PythonCompletionTest extends PyTestCase {
     runWithLanguageLevel(LanguageLevel.PYTHON27, new Runnable() {
       @Override
       public void run() {
-        myFixture.copyDirectoryToProject("completion/relativeImportExcludeToplevel", "");
+        myFixture.copyDirectoryToProject("relativeImportExcludeToplevel", "");
         myFixture.configureByFile("pack/subpack/modX.py");
         myFixture.completeBasic();
         assertNull(myFixture.getLookupElementStrings());
@@ -560,10 +556,10 @@ public class PythonCompletionTest extends PyTestCase {
   }
 
   public void testLocalImportedModule() {  // PY-3668
-    myFixture.copyDirectoryToProject("completion/py3668", "");
+    myFixture.copyDirectoryToProject("py3668", "");
     myFixture.configureByFile("py3668.py");
     myFixture.completeBasic();
-    myFixture.checkResultByFile("completion/py3668/py3668.after.py");
+    myFixture.checkResultByFile("py3668/py3668.after.py");
   }
 
   public void testDuplicateDunderAll() {  // PY-6483
@@ -622,7 +618,7 @@ public class PythonCompletionTest extends PyTestCase {
 
   // PY-13140
   public void testModulePrivateNamesCompletedInsideImport() {
-    myFixture.copyDirectoryToProject("completion/" + getTestName(true), "");
+    myFixture.copyDirectoryToProject(getTestName(true), "");
     myFixture.configureByFile("a.py");
     myFixture.completeBasic();
     List<String> suggested = myFixture.getLookupElementStrings();
@@ -729,7 +725,7 @@ public class PythonCompletionTest extends PyTestCase {
 
   // PY-14387
   public void testSubmoduleOfIndirectlyImportedPackage() {
-    myFixture.copyDirectoryToProject("completion/" + getTestName(true), "");
+    myFixture.copyDirectoryToProject(getTestName(true), "");
     myFixture.configureByFile("a.py");
     myFixture.completeBasic();
     final List<String> suggested = myFixture.getLookupElementStrings();
@@ -739,7 +735,7 @@ public class PythonCompletionTest extends PyTestCase {
 
   // PY-14519
   public void testOsPath() {
-    myFixture.copyDirectoryToProject("completion/" + getTestName(true), "");
+    myFixture.copyDirectoryToProject(getTestName(true), "");
     myFixture.configureByFile("a.py");
     myFixture.completeBasic();
     final List<String> suggested = myFixture.getLookupElementStrings();
@@ -749,7 +745,7 @@ public class PythonCompletionTest extends PyTestCase {
 
   // PY-14331
   public void testExcludedTopLevelPackage() {
-    myFixture.copyDirectoryToProject("completion/" + getTestName(true), "");
+    myFixture.copyDirectoryToProject(getTestName(true), "");
     myFixture.configureByFile("a.py");
     PsiTestUtil.addExcludedRoot(myFixture.getModule(), myFixture.findFileInTempDir("pkg1"));
     final LookupElement[] variants = myFixture.completeBasic();
@@ -759,7 +755,7 @@ public class PythonCompletionTest extends PyTestCase {
 
   // PY-14331
   public void testExcludedSubPackage() {
-    myFixture.copyDirectoryToProject("completion/" + getTestName(true), "");
+    myFixture.copyDirectoryToProject(getTestName(true), "");
     myFixture.configureByFile("a.py");
     PsiTestUtil.addExcludedRoot(myFixture.getModule(), myFixture.findFileInTempDir("pkg1/subpkg1"));
     final LookupElement[] variants = myFixture.completeBasic();
@@ -769,7 +765,7 @@ public class PythonCompletionTest extends PyTestCase {
 
   // PY-15119
   public void testRelativeFromImportWhitespacesAfterDot() {
-    myFixture.copyDirectoryToProject("completion/" + getTestName(true), "");
+    myFixture.copyDirectoryToProject(getTestName(true), "");
     myFixture.configureByFile("pkg/subpkg1/a.py");
     myFixture.completeBasic();
     assertSameElements(myFixture.getLookupElementStrings(), "import", "subpkg1", "subpkg2", "m");
@@ -783,4 +779,9 @@ public class PythonCompletionTest extends PyTestCase {
   public void testNext() {
     doTest();
   }
+
+  @Override
+  protected String getTestDataPath() {
+    return super.getTestDataPath() + "/completion";
+  }
 }
diff --git a/python/testSrc/com/jetbrains/python/PythonDoctestCompletionTest.java b/python/testSrc/com/jetbrains/python/PythonDoctestCompletionTest.java
index 3987ba6c0c0d..68a965221380 100644
--- a/python/testSrc/com/jetbrains/python/PythonDoctestCompletionTest.java
+++ b/python/testSrc/com/jetbrains/python/PythonDoctestCompletionTest.java
@@ -24,7 +24,7 @@ import com.jetbrains.python.fixtures.PyTestCase;
 public class PythonDoctestCompletionTest extends PyTestCase {
 
   private void doDoctestTest(String expected) {
-    final String testName = "completion/doctest/" + getTestName(true);
+    final String testName = getTestName(true);
     myFixture.configureByFile(testName + ".py");
     final LookupElement[] elements = myFixture.completeBasic();
     if (elements != null) {
@@ -49,4 +49,8 @@ public class PythonDoctestCompletionTest extends PyTestCase {
     doDoctestTest("foo");
   }
 
+  @Override
+  protected String getTestDataPath() {
+    return super.getTestDataPath() + "/completion/doctest";
+  }
 }