diff --git a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java
index 76481bee353..357adb5caff 100644
--- a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java
+++ b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java
@@ -229,7 +229,7 @@ public class GenerateTests {
 
         generateTest(
                 "idea/tests/",
-                "JetBasicJSCompletionTest",
+                "JetBasicJSCompletionTestGenerated",
                 AbstractJetJSCompletionTest.class,
                 testModel("idea/testData/completion/basic/common"),
                 testModel("idea/testData/completion/basic/js")
@@ -237,7 +237,7 @@ public class GenerateTests {
 
         generateTest(
                 "idea/tests/",
-                "JetBasicJavaCompletionTest",
+                "JetBasicJavaCompletionTestGenerated",
                 AbstractJavaCompletionTest.class,
                 testModel("idea/testData/completion/basic/common"),
                 testModel("idea/testData/completion/basic/java")
diff --git a/idea/tests/org/jetbrains/jet/completion/JetBasicJSCompletionTest.java b/idea/tests/org/jetbrains/jet/completion/JetBasicJSCompletionTestGenerated.java
similarity index 98%
rename from idea/tests/org/jetbrains/jet/completion/JetBasicJSCompletionTest.java
rename to idea/tests/org/jetbrains/jet/completion/JetBasicJSCompletionTestGenerated.java
index 71fb421f233..8671b450cf2 100644
--- a/idea/tests/org/jetbrains/jet/completion/JetBasicJSCompletionTest.java
+++ b/idea/tests/org/jetbrains/jet/completion/JetBasicJSCompletionTestGenerated.java
@@ -30,8 +30,8 @@ import org.jetbrains.jet.completion.AbstractJetJSCompletionTest;
 
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@InnerTestClasses({JetBasicJSCompletionTest.Common.class, JetBasicJSCompletionTest.Js.class})
-public class JetBasicJSCompletionTest extends AbstractJetJSCompletionTest {
+@InnerTestClasses({JetBasicJSCompletionTestGenerated.Common.class, JetBasicJSCompletionTestGenerated.Js.class})
+public class JetBasicJSCompletionTestGenerated extends AbstractJetJSCompletionTest {
     @TestMetadata("idea/testData/completion/basic/common")
     @InnerTestClasses({Common.Extensions.class})
     public static class Common extends AbstractJetJSCompletionTest {
@@ -429,7 +429,7 @@ public class JetBasicJSCompletionTest extends AbstractJetJSCompletionTest {
     }
     
     public static Test suite() {
-        TestSuite suite = new TestSuite("JetBasicJSCompletionTest");
+        TestSuite suite = new TestSuite("JetBasicJSCompletionTestGenerated");
         suite.addTest(Common.innerSuite());
         suite.addTestSuite(Js.class);
         return suite;
diff --git a/idea/tests/org/jetbrains/jet/completion/JetBasicJavaCompletionTest.java b/idea/tests/org/jetbrains/jet/completion/JetBasicJavaCompletionTestGenerated.java
similarity index 98%
rename from idea/tests/org/jetbrains/jet/completion/JetBasicJavaCompletionTest.java
rename to idea/tests/org/jetbrains/jet/completion/JetBasicJavaCompletionTestGenerated.java
index f46cdb76c86..912c4c5bff4 100644
--- a/idea/tests/org/jetbrains/jet/completion/JetBasicJavaCompletionTest.java
+++ b/idea/tests/org/jetbrains/jet/completion/JetBasicJavaCompletionTestGenerated.java
@@ -30,8 +30,8 @@ import org.jetbrains.jet.completion.AbstractJavaCompletionTest;
 
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@InnerTestClasses({JetBasicJavaCompletionTest.Common.class, JetBasicJavaCompletionTest.Java.class})
-public class JetBasicJavaCompletionTest extends AbstractJavaCompletionTest {
+@InnerTestClasses({JetBasicJavaCompletionTestGenerated.Common.class, JetBasicJavaCompletionTestGenerated.Java.class})
+public class JetBasicJavaCompletionTestGenerated extends AbstractJavaCompletionTest {
     @TestMetadata("idea/testData/completion/basic/common")
     @InnerTestClasses({Common.Extensions.class})
     public static class Common extends AbstractJavaCompletionTest {
@@ -454,7 +454,7 @@ public class JetBasicJavaCompletionTest extends AbstractJavaCompletionTest {
     }
     
     public static Test suite() {
-        TestSuite suite = new TestSuite("JetBasicJavaCompletionTest");
+        TestSuite suite = new TestSuite("JetBasicJavaCompletionTestGenerated");
         suite.addTest(Common.innerSuite());
         suite.addTestSuite(Java.class);
         return suite;