diff --git a/python/testData/testRunner/dependentTests/my_class_test.py b/python/testData/testRunner/dependentTests/test_my_class.py
similarity index 100%
rename from python/testData/testRunner/dependentTests/my_class_test.py
rename to python/testData/testRunner/dependentTests/test_my_class.py
diff --git a/python/testData/testRunner/tests/subfolder/subtest.py b/python/testData/testRunner/tests/subfolder/test2.py
similarity index 100%
rename from python/testData/testRunner/tests/subfolder/subtest.py
rename to python/testData/testRunner/tests/subfolder/test2.py
diff --git a/python/testData/testRunner/tests/unittest1.py b/python/testData/testRunner/tests/test1.py
similarity index 100%
rename from python/testData/testRunner/tests/unittest1.py
rename to python/testData/testRunner/tests/test1.py
diff --git a/python/testSrc/com/jetbrains/python/testRunner/PyTestRunnerTest.java b/python/testSrc/com/jetbrains/python/testRunner/PyTestRunnerTest.java
index a8f9c96e2feb..45a71918b0a0 100644
--- a/python/testSrc/com/jetbrains/python/testRunner/PyTestRunnerTest.java
+++ b/python/testSrc/com/jetbrains/python/testRunner/PyTestRunnerTest.java
@@ -31,13 +31,13 @@ public class PyTestRunnerTest extends LightPlatformTestCase {
 
   public void testFile() throws ExecutionException {
     final File testDir = getTestDataDir();
-    File testFile = new File(testDir, "unittest1.py");
+    File testFile = new File(testDir, "test1.py");
     String[] result = runUTRunner(testDir.getPath(), testFile.getPath(), "true");
     assertEquals(StringUtil.join(result, "\n"), 11, result.length);
     assertEquals("##teamcity[testCount count='2']", result [0]);
     assertEquals("##teamcity[enteredTheMatrix]", result [1]);
-    assertEquals("##teamcity[testSuiteStarted locationHint='python_uttestid://unittest1.BadTest' name='unittest1.BadTest']", result [2]);
-    assertEquals("##teamcity[testStarted locationHint='python_uttestid://unittest1.BadTest.test_fails' name='test_fails']", result[3]);
+    assertEquals("##teamcity[testSuiteStarted locationHint='python_uttestid://test1.BadTest' name='test1.BadTest']", result [2]);
+    assertEquals("##teamcity[testStarted locationHint='python_uttestid://test1.BadTest.test_fails' name='test_fails']", result[3]);
     assertTrue(result [4], result[4].startsWith("##teamcity[testFailed") && result [4].contains("name='test_fails'"));
   }
 
@@ -47,14 +47,14 @@ public class PyTestRunnerTest extends LightPlatformTestCase {
 
   public void testClass() throws ExecutionException {
     final File testDir = getTestDataDir();
-    File testFile = new File(testDir, "unittest1.py");
+    File testFile = new File(testDir, "test1.py");
     String[] result = runUTRunner(testDir.getPath(), testFile.getPath() + "::GoodTest", "true");
     assertEquals(StringUtil.join(result, "\n"), 6, result.length);
   }
 
   public void testMethod() throws ExecutionException {
     final File testDir = getTestDataDir();
-    File testFile = new File(testDir, "unittest1.py");
+    File testFile = new File(testDir, "test1.py");
     String[] result = runUTRunner(testDir.getPath(), testFile.getPath() + "::GoodTest::test_passes", "true");
     assertEquals(StringUtil.join(result, "\n"), 6, result.length);
   }
@@ -67,7 +67,7 @@ public class PyTestRunnerTest extends LightPlatformTestCase {
 
   public void testDependent() throws ExecutionException {
     final File testDir = new File(PythonTestUtil.getTestDataPath(), "testRunner");
-    String[] result = runUTRunner(testDir.getPath(), new File(testDir, "dependentTests/my_class_test.py").getPath(), "true");
+    String[] result = runUTRunner(testDir.getPath(), new File(testDir, "dependentTests/test_my_class.py").getPath(), "true");
     assertEquals(StringUtil.join(result, "\n"), 6, result.length);
   }