diff --git a/compiler/testData/loadJava/NestedClass.java b/compiler/testData/loadJava/NestedClass.java
new file mode 100644
index 00000000000..80ecb56c4bc
--- /dev/null
+++ b/compiler/testData/loadJava/NestedClass.java
@@ -0,0 +1,6 @@
+package test;
+
+public class NestedClass {
+    public static class Nested {
+    }
+}
diff --git a/compiler/testData/loadJava/NestedClass.kt b/compiler/testData/loadJava/NestedClass.kt
new file mode 100644
index 00000000000..6d90310a9ce
--- /dev/null
+++ b/compiler/testData/loadJava/NestedClass.kt
@@ -0,0 +1,5 @@
+package test
+
+public open class NestedClass() : java.lang.Object() {
+    public open class Nested() : java.lang.Object()
+}
diff --git a/compiler/testData/loadJava/NestedClass.txt b/compiler/testData/loadJava/NestedClass.txt
new file mode 100644
index 00000000000..04335e91d8e
--- /dev/null
+++ b/compiler/testData/loadJava/NestedClass.txt
@@ -0,0 +1,9 @@
+package test
+
+public open class NestedClass : java.lang.Object {
+    public constructor NestedClass()
+    
+    public open class Nested : java.lang.Object {
+        public constructor Nested()
+    }
+}
diff --git a/compiler/testData/loadKotlin/class/InnerGenericClass.kt b/compiler/testData/loadKotlin/class/InnerGenericClass.kt
new file mode 100644
index 00000000000..d4f1cea7754
--- /dev/null
+++ b/compiler/testData/loadKotlin/class/InnerGenericClass.kt
@@ -0,0 +1,5 @@
+package test
+
+class Outer {
+    inner class Inner<T>
+}
diff --git a/compiler/testData/loadKotlin/class/InnerGenericClass.txt b/compiler/testData/loadKotlin/class/InnerGenericClass.txt
new file mode 100644
index 00000000000..7e9699401f2
--- /dev/null
+++ b/compiler/testData/loadKotlin/class/InnerGenericClass.txt
@@ -0,0 +1,9 @@
+package test
+
+internal final class Outer {
+    /*primary*/ public constructor Outer()
+    
+    internal final inner class Inner</*0*/ T> {
+        /*primary*/ public constructor Inner</*0*/ T>()
+    }
+}
diff --git a/compiler/testData/loadKotlin/class/NestedClassExtendNestedClass.kt b/compiler/testData/loadKotlin/class/NestedClassExtendNestedClass.kt
new file mode 100644
index 00000000000..29f0034fec7
--- /dev/null
+++ b/compiler/testData/loadKotlin/class/NestedClassExtendNestedClass.kt
@@ -0,0 +1,7 @@
+package test
+
+class Outer() {
+    open class Nested1()
+    
+    class Nested2() : Nested1()
+}
diff --git a/compiler/testData/loadKotlin/class/NestedClassExtendNestedClass.txt b/compiler/testData/loadKotlin/class/NestedClassExtendNestedClass.txt
new file mode 100644
index 00000000000..38711878e83
--- /dev/null
+++ b/compiler/testData/loadKotlin/class/NestedClassExtendNestedClass.txt
@@ -0,0 +1,13 @@
+package test
+
+internal final class Outer {
+    /*primary*/ public constructor Outer()
+    
+    internal open class Nested1 {
+        /*primary*/ public constructor Nested1()
+    }
+    
+    internal final class Nested2 : test.Outer.Nested1 {
+        /*primary*/ public constructor Nested2()
+    }
+}
diff --git a/compiler/testData/loadKotlin/class/NestedGenericClass.kt b/compiler/testData/loadKotlin/class/NestedGenericClass.kt
new file mode 100644
index 00000000000..5602ca5c4cb
--- /dev/null
+++ b/compiler/testData/loadKotlin/class/NestedGenericClass.kt
@@ -0,0 +1,5 @@
+package test
+
+class Outer {
+    class Nested<T>
+}
diff --git a/compiler/testData/loadKotlin/class/NestedGenericClass.txt b/compiler/testData/loadKotlin/class/NestedGenericClass.txt
new file mode 100644
index 00000000000..7a9518a1f21
--- /dev/null
+++ b/compiler/testData/loadKotlin/class/NestedGenericClass.txt
@@ -0,0 +1,9 @@
+package test
+
+internal final class Outer {
+    /*primary*/ public constructor Outer()
+    
+    internal final class Nested</*0*/ T> {
+        /*primary*/ public constructor Nested</*0*/ T>()
+    }
+}
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java
index 91d7f401d38..37fe49cfa78 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java
@@ -135,6 +135,11 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT
             doTest("compiler/testData/loadKotlin/class/InnerClassExtendInnerClass.kt");
         }
         
+        @TestMetadata("InnerGenericClass.kt")
+        public void testInnerGenericClass() throws Exception {
+            doTest("compiler/testData/loadKotlin/class/InnerGenericClass.kt");
+        }
+        
         @TestMetadata("NamedObject.kt")
         public void testNamedObject() throws Exception {
             doTest("compiler/testData/loadKotlin/class/NamedObject.kt");
@@ -160,6 +165,16 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT
             doTest("compiler/testData/loadKotlin/class/NestedClass.kt");
         }
         
+        @TestMetadata("NestedClassExtendNestedClass.kt")
+        public void testNestedClassExtendNestedClass() throws Exception {
+            doTest("compiler/testData/loadKotlin/class/NestedClassExtendNestedClass.kt");
+        }
+        
+        @TestMetadata("NestedGenericClass.kt")
+        public void testNestedGenericClass() throws Exception {
+            doTest("compiler/testData/loadKotlin/class/NestedGenericClass.kt");
+        }
+        
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
             doTest("compiler/testData/loadKotlin/class/Trait.kt");
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
index ce27bfb1659..ce1e6278e54 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
@@ -139,6 +139,11 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         doTest("compiler/testData/loadJava/MyException.java");
     }
     
+    @TestMetadata("NestedClass.java")
+    public void testNestedClass() throws Exception {
+        doTest("compiler/testData/loadJava/NestedClass.java");
+    }
+    
     @TestMetadata("RemoveRedundantProjectionKind.java")
     public void testRemoveRedundantProjectionKind() throws Exception {
         doTest("compiler/testData/loadJava/RemoveRedundantProjectionKind.java");
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
index c5d365dae39..79a58a0879f 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
@@ -137,6 +137,11 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
                 doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/class/InnerClassExtendInnerClass.kt");
             }
             
+            @TestMetadata("InnerGenericClass.kt")
+            public void testInnerGenericClass() throws Exception {
+                doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/class/InnerGenericClass.kt");
+            }
+            
             @TestMetadata("NamedObject.kt")
             public void testNamedObject() throws Exception {
                 doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/class/NamedObject.kt");
@@ -162,6 +167,16 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
                 doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/class/NestedClass.kt");
             }
             
+            @TestMetadata("NestedClassExtendNestedClass.kt")
+            public void testNestedClassExtendNestedClass() throws Exception {
+                doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/class/NestedClassExtendNestedClass.kt");
+            }
+            
+            @TestMetadata("NestedGenericClass.kt")
+            public void testNestedGenericClass() throws Exception {
+                doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/class/NestedGenericClass.kt");
+            }
+            
             @TestMetadata("Trait.kt")
             public void testTrait() throws Exception {
                 doTestCheckingPrimaryConstructors("compiler/testData/loadKotlin/class/Trait.kt");
@@ -1059,6 +1074,11 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
             doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/MyException.kt");
         }
         
+        @TestMetadata("NestedClass.kt")
+        public void testNestedClass() throws Exception {
+            doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/NestedClass.kt");
+        }
+        
         @TestMetadata("RemoveRedundantProjectionKind.kt")
         public void testRemoveRedundantProjectionKind() throws Exception {
             doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/RemoveRedundantProjectionKind.kt");