diff --git a/compiler/testData/asJava/lightClasses/ClassObject.kt b/compiler/testData/asJava/lightClassStructure/ClassObject.kt
similarity index 100%
rename from compiler/testData/asJava/lightClasses/ClassObject.kt
rename to compiler/testData/asJava/lightClassStructure/ClassObject.kt
diff --git a/compiler/testData/asJava/lightClasses/CodeWithErrors.kt b/compiler/testData/asJava/lightClassStructure/CodeWithErrors.kt
similarity index 100%
rename from compiler/testData/asJava/lightClasses/CodeWithErrors.kt
rename to compiler/testData/asJava/lightClassStructure/CodeWithErrors.kt
diff --git a/compiler/testData/asJava/lightClasses/Declared.kt b/compiler/testData/asJava/lightClassStructure/Declared.kt
similarity index 100%
rename from compiler/testData/asJava/lightClasses/Declared.kt
rename to compiler/testData/asJava/lightClassStructure/Declared.kt
diff --git a/compiler/testData/asJava/lightClasses/DeclaredWithGenerics.kt b/compiler/testData/asJava/lightClassStructure/DeclaredWithGenerics.kt
similarity index 100%
rename from compiler/testData/asJava/lightClasses/DeclaredWithGenerics.kt
rename to compiler/testData/asJava/lightClassStructure/DeclaredWithGenerics.kt
diff --git a/compiler/testData/asJava/lightClasses/Package.kt b/compiler/testData/asJava/lightClassStructure/Package.kt
similarity index 100%
rename from compiler/testData/asJava/lightClasses/Package.kt
rename to compiler/testData/asJava/lightClassStructure/Package.kt
diff --git a/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassCoherenceTest.java b/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassCoherenceTest.java
index 1e014000a6c..b34f83dd04c 100644
--- a/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassCoherenceTest.java
+++ b/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassCoherenceTest.java
@@ -35,9 +35,9 @@ public class KotlinLightClassCoherenceTest extends KotlinAsJavaTestBase {
     @Override
     protected List<File> getKotlinSourceRoots() {
         return Lists.newArrayList(
-                new File("compiler/testData/asJava/lightClasses/Declared.kt"),
-                new File("compiler/testData/asJava/lightClasses/Package.kt"),
-                new File("compiler/testData/asJava/lightClasses/ClassObject.kt")
+                new File("compiler/testData/asJava/lightClassStructure/Declared.kt"),
+                new File("compiler/testData/asJava/lightClassStructure/Package.kt"),
+                new File("compiler/testData/asJava/lightClassStructure/ClassObject.kt")
         );
     }
 
diff --git a/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTest.java b/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassStructureTest.java
similarity index 94%
rename from compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTest.java
rename to compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassStructureTest.java
index 2add8c575fe..3e3cac00223 100644
--- a/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTest.java
+++ b/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassStructureTest.java
@@ -30,17 +30,17 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
-import static org.jetbrains.jet.asJava.KotlinLightClassTest.ClassProperty.*;
+import static org.jetbrains.jet.asJava.KotlinLightClassStructureTest.ClassProperty.*;
 
 @SuppressWarnings("JUnitTestClassNamingConvention")
-public abstract class KotlinLightClassTest extends KotlinAsJavaTestBase {
+public abstract class KotlinLightClassStructureTest extends KotlinAsJavaTestBase {
 
-    public static class Declared extends KotlinLightClassTest {
+    public static class Declared extends KotlinLightClassStructureTest {
 
         @Override
         protected List<File> getKotlinSourceRoots() {
             return Collections.singletonList(
-                    new File("compiler/testData/asJava/lightClasses/Declared.kt")
+                    new File("compiler/testData/asJava/lightClassStructure/Declared.kt")
             );
         }
 
@@ -95,12 +95,12 @@ public abstract class KotlinLightClassTest extends KotlinAsJavaTestBase {
         }
     }
 
-    public static class DeclaredWithGenerics extends KotlinLightClassTest {
+    public static class DeclaredWithGenerics extends KotlinLightClassStructureTest {
 
         @Override
         protected List<File> getKotlinSourceRoots() {
             return Collections.singletonList(
-                    new File("compiler/testData/asJava/lightClasses/DeclaredWithGenerics.kt")
+                    new File("compiler/testData/asJava/lightClassStructure/DeclaredWithGenerics.kt")
             );
         }
 
@@ -123,12 +123,12 @@ public abstract class KotlinLightClassTest extends KotlinAsJavaTestBase {
         }
     }
 
-    public static class Package extends KotlinLightClassTest {
+    public static class Package extends KotlinLightClassStructureTest {
 
         @Override
         protected List<File> getKotlinSourceRoots() {
             return Collections.singletonList(
-                    new File("compiler/testData/asJava/lightClasses/Package.kt")
+                    new File("compiler/testData/asJava/lightClassStructure/Package.kt")
             );
         }
 
@@ -137,10 +137,10 @@ public abstract class KotlinLightClassTest extends KotlinAsJavaTestBase {
         }
     }
 
-    public static class CodeWithErrors extends KotlinLightClassTest {
+    public static class CodeWithErrors extends KotlinLightClassStructureTest {
         @Override
         protected List<File> getKotlinSourceRoots() {
-            return Collections.singletonList(new File("compiler/testData/asJava/lightClasses/CodeWithErrors.kt"));
+            return Collections.singletonList(new File("compiler/testData/asJava/lightClassStructure/CodeWithErrors.kt"));
         }
 
         public void testClassWithErrors() {