diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
index 2c1ae5afb23..1b7de86cbc9 100644
--- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
@@ -447,11 +447,11 @@ fun main(args: Array<String>) {
         }
 
         testClass(javaClass<AbstractCompiledKotlinInJavaCompletionTest>()) {
-            model("completion/injava/compiled", extension = "java")
+            model("completion/injava", extension = "java")
         }
 
         testClass(javaClass<AbstractKotlinSourceInJavaCompletionTest>()) {
-            model("completion/injava/compiled", extension = "java")
+            model("completion/injava", extension = "java")
         }
     }
 
diff --git a/idea/testData/completion/injava/compiled/Class.java b/idea/testData/completion/injava/Class.java
similarity index 100%
rename from idea/testData/completion/injava/compiled/Class.java
rename to idea/testData/completion/injava/Class.java
diff --git a/idea/testData/completion/injava/compiled/ClassMembers.java b/idea/testData/completion/injava/ClassMembers.java
similarity index 100%
rename from idea/testData/completion/injava/compiled/ClassMembers.java
rename to idea/testData/completion/injava/ClassMembers.java
diff --git a/idea/testData/completion/injava/compiled/ClassesFromNamespace.java b/idea/testData/completion/injava/ClassesFromNamespace.java
similarity index 100%
rename from idea/testData/completion/injava/compiled/ClassesFromNamespace.java
rename to idea/testData/completion/injava/ClassesFromNamespace.java
diff --git a/idea/testData/completion/injava/compiled/EnumConstants.java b/idea/testData/completion/injava/EnumConstants.java
similarity index 100%
rename from idea/testData/completion/injava/compiled/EnumConstants.java
rename to idea/testData/completion/injava/EnumConstants.java
diff --git a/idea/testData/completion/injava/compiled/ObjectInstance.java b/idea/testData/completion/injava/ObjectInstance.java
similarity index 100%
rename from idea/testData/completion/injava/compiled/ObjectInstance.java
rename to idea/testData/completion/injava/ObjectInstance.java
diff --git a/idea/testData/completion/injava/compiled/Subpackage.java b/idea/testData/completion/injava/Subpackage.java
similarity index 100%
rename from idea/testData/completion/injava/compiled/Subpackage.java
rename to idea/testData/completion/injava/Subpackage.java
diff --git a/idea/testData/completion/injava/compiled/TopLevelMembers.java b/idea/testData/completion/injava/TopLevelMembers.java
similarity index 100%
rename from idea/testData/completion/injava/compiled/TopLevelMembers.java
rename to idea/testData/completion/injava/TopLevelMembers.java
diff --git a/idea/testData/completion/injava/compiled/TraitMember.java b/idea/testData/completion/injava/TraitMember.java
similarity index 100%
rename from idea/testData/completion/injava/compiled/TraitMember.java
rename to idea/testData/completion/injava/TraitMember.java
diff --git a/idea/testData/completion/injava/compiled/mockLib/another.kt b/idea/testData/completion/injava/mockLib/another.kt
similarity index 100%
rename from idea/testData/completion/injava/compiled/mockLib/another.kt
rename to idea/testData/completion/injava/mockLib/another.kt
diff --git a/idea/testData/completion/injava/compiled/mockLib/main.kt b/idea/testData/completion/injava/mockLib/main.kt
similarity index 100%
rename from idea/testData/completion/injava/compiled/mockLib/main.kt
rename to idea/testData/completion/injava/mockLib/main.kt
diff --git a/idea/tests/org/jetbrains/jet/completion/AbstractCompiledKotlinInJavaCompletionTest.java b/idea/tests/org/jetbrains/jet/completion/AbstractCompiledKotlinInJavaCompletionTest.java
index 2681d825618..3ce8e48f38e 100644
--- a/idea/tests/org/jetbrains/jet/completion/AbstractCompiledKotlinInJavaCompletionTest.java
+++ b/idea/tests/org/jetbrains/jet/completion/AbstractCompiledKotlinInJavaCompletionTest.java
@@ -16,7 +16,7 @@ public abstract class AbstractCompiledKotlinInJavaCompletionTest extends JetFixt
     @NotNull
     @Override
     protected LightProjectDescriptor getProjectDescriptor() {
-        return new JdkAndMockLibraryProjectDescriptor(PluginTestCaseBase.getTestDataPathBase() + "/completion/injava/compiled/mockLib", false);
+        return new JdkAndMockLibraryProjectDescriptor(PluginTestCaseBase.getTestDataPathBase() + "/completion/injava/mockLib", false);
     }
 
     @NotNull
diff --git a/idea/tests/org/jetbrains/jet/completion/AbstractKotlinSourceInJavaCompletionTest.java b/idea/tests/org/jetbrains/jet/completion/AbstractKotlinSourceInJavaCompletionTest.java
index 23bec7f553f..4056609d02e 100644
--- a/idea/tests/org/jetbrains/jet/completion/AbstractKotlinSourceInJavaCompletionTest.java
+++ b/idea/tests/org/jetbrains/jet/completion/AbstractKotlinSourceInJavaCompletionTest.java
@@ -19,7 +19,7 @@ public abstract class AbstractKotlinSourceInJavaCompletionTest extends JetFixtur
 
     @Override
     public void doTest(String testPath) {
-        File mockLibDir = new File(PluginTestCaseBase.getTestDataPathBase() + "/completion/injava/compiled/mockLib");
+        File mockLibDir = new File(PluginTestCaseBase.getTestDataPathBase() + "/completion/injava/mockLib");
         File[] listFiles = mockLibDir.listFiles();
         assertNotNull(listFiles);
         String[] paths = ArrayUtil.toStringArray(ContainerUtil.map(listFiles, new Function<File, String>() {
diff --git a/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java
index 8d73fcbb576..3643498275a 100644
--- a/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java
@@ -30,51 +30,51 @@ import org.jetbrains.jet.completion.AbstractCompiledKotlinInJavaCompletionTest;
 
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("idea/testData/completion/injava/compiled")
+@TestMetadata("idea/testData/completion/injava")
 @InnerTestClasses({})
 public class CompiledKotlinInJavaCompletionTestGenerated extends AbstractCompiledKotlinInJavaCompletionTest {
-    public void testAllFilesPresentInCompiled() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/completion/injava/compiled"), Pattern.compile("^(.+)\\.java$"), true);
+    public void testAllFilesPresentInInjava() throws Exception {
+        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/completion/injava"), Pattern.compile("^(.+)\\.java$"), true);
     }
     
     @TestMetadata("Class.java")
     public void testClass() throws Exception {
-        doTest("idea/testData/completion/injava/compiled/Class.java");
+        doTest("idea/testData/completion/injava/Class.java");
     }
     
     @TestMetadata("ClassMembers.java")
     public void testClassMembers() throws Exception {
-        doTest("idea/testData/completion/injava/compiled/ClassMembers.java");
+        doTest("idea/testData/completion/injava/ClassMembers.java");
     }
     
     @TestMetadata("ClassesFromNamespace.java")
     public void testClassesFromNamespace() throws Exception {
-        doTest("idea/testData/completion/injava/compiled/ClassesFromNamespace.java");
+        doTest("idea/testData/completion/injava/ClassesFromNamespace.java");
     }
     
     @TestMetadata("EnumConstants.java")
     public void testEnumConstants() throws Exception {
-        doTest("idea/testData/completion/injava/compiled/EnumConstants.java");
+        doTest("idea/testData/completion/injava/EnumConstants.java");
     }
     
     @TestMetadata("ObjectInstance.java")
     public void testObjectInstance() throws Exception {
-        doTest("idea/testData/completion/injava/compiled/ObjectInstance.java");
+        doTest("idea/testData/completion/injava/ObjectInstance.java");
     }
     
     @TestMetadata("Subpackage.java")
     public void testSubpackage() throws Exception {
-        doTest("idea/testData/completion/injava/compiled/Subpackage.java");
+        doTest("idea/testData/completion/injava/Subpackage.java");
     }
     
     @TestMetadata("TopLevelMembers.java")
     public void testTopLevelMembers() throws Exception {
-        doTest("idea/testData/completion/injava/compiled/TopLevelMembers.java");
+        doTest("idea/testData/completion/injava/TopLevelMembers.java");
     }
     
     @TestMetadata("TraitMember.java")
     public void testTraitMember() throws Exception {
-        doTest("idea/testData/completion/injava/compiled/TraitMember.java");
+        doTest("idea/testData/completion/injava/TraitMember.java");
     }
     
     public static Test suite() {
diff --git a/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java
index 7e04ac947f4..4bb66cb0f8c 100644
--- a/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java
@@ -30,51 +30,51 @@ import org.jetbrains.jet.completion.AbstractKotlinSourceInJavaCompletionTest;
 
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("idea/testData/completion/injava/compiled")
+@TestMetadata("idea/testData/completion/injava")
 @InnerTestClasses({})
 public class KotlinSourceInJavaCompletionTestGenerated extends AbstractKotlinSourceInJavaCompletionTest {
-    public void testAllFilesPresentInCompiled() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/completion/injava/compiled"), Pattern.compile("^(.+)\\.java$"), true);
+    public void testAllFilesPresentInInjava() throws Exception {
+        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/completion/injava"), Pattern.compile("^(.+)\\.java$"), true);
     }
     
     @TestMetadata("Class.java")
     public void testClass() throws Exception {
-        doTest("idea/testData/completion/injava/compiled/Class.java");
+        doTest("idea/testData/completion/injava/Class.java");
     }
     
     @TestMetadata("ClassMembers.java")
     public void testClassMembers() throws Exception {
-        doTest("idea/testData/completion/injava/compiled/ClassMembers.java");
+        doTest("idea/testData/completion/injava/ClassMembers.java");
     }
     
     @TestMetadata("ClassesFromNamespace.java")
     public void testClassesFromNamespace() throws Exception {
-        doTest("idea/testData/completion/injava/compiled/ClassesFromNamespace.java");
+        doTest("idea/testData/completion/injava/ClassesFromNamespace.java");
     }
     
     @TestMetadata("EnumConstants.java")
     public void testEnumConstants() throws Exception {
-        doTest("idea/testData/completion/injava/compiled/EnumConstants.java");
+        doTest("idea/testData/completion/injava/EnumConstants.java");
     }
     
     @TestMetadata("ObjectInstance.java")
     public void testObjectInstance() throws Exception {
-        doTest("idea/testData/completion/injava/compiled/ObjectInstance.java");
+        doTest("idea/testData/completion/injava/ObjectInstance.java");
     }
     
     @TestMetadata("Subpackage.java")
     public void testSubpackage() throws Exception {
-        doTest("idea/testData/completion/injava/compiled/Subpackage.java");
+        doTest("idea/testData/completion/injava/Subpackage.java");
     }
     
     @TestMetadata("TopLevelMembers.java")
     public void testTopLevelMembers() throws Exception {
-        doTest("idea/testData/completion/injava/compiled/TopLevelMembers.java");
+        doTest("idea/testData/completion/injava/TopLevelMembers.java");
     }
     
     @TestMetadata("TraitMember.java")
     public void testTraitMember() throws Exception {
-        doTest("idea/testData/completion/injava/compiled/TraitMember.java");
+        doTest("idea/testData/completion/injava/TraitMember.java");
     }
     
     public static Test suite() {