diff --git a/compiler/testData/loadJava/ClassWithTypePRefSelfAndClass.java b/compiler/testData/loadJava/ClassWithTypePRefSelfAndClass.java
new file mode 100644
index 00000000000..109be840f46
--- /dev/null
+++ b/compiler/testData/loadJava/ClassWithTypePRefSelfAndClass.java
@@ -0,0 +1,4 @@
+package test;
+
+public final class ClassWithTypePRefSelfAndClass<P extends ClassWithTypePRefSelfAndClass<P>> {
+}
diff --git a/compiler/testData/loadJava/ClassWithTypePRefSelfAndClass.kt b/compiler/testData/loadJava/ClassWithTypePRefSelfAndClass.kt
new file mode 100644
index 00000000000..e0683f8b51a
--- /dev/null
+++ b/compiler/testData/loadJava/ClassWithTypePRefSelfAndClass.kt
@@ -0,0 +1,4 @@
+package test
+
+public class ClassWithTypePRefSelfAndClass<P: ClassWithTypePRefSelfAndClass<P>?>(): Object() {
+}
diff --git a/compiler/testData/loadJava/ClassWithTypePRefSelfAndClass.txt b/compiler/testData/loadJava/ClassWithTypePRefSelfAndClass.txt
new file mode 100644
index 00000000000..9f6a5dc693e
--- /dev/null
+++ b/compiler/testData/loadJava/ClassWithTypePRefSelfAndClass.txt
@@ -0,0 +1,5 @@
+namespace test
+
+public final class test.ClassWithTypePRefSelfAndClass</*0*/ P : test.ClassWithTypePRefSelfAndClass<P>?> : java.lang.Object {
+    public final /*constructor*/ fun </*0*/ P : test.ClassWithTypePRefSelfAndClass<P>?><init>(): test.ClassWithTypePRefSelfAndClass<P>
+}
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
index 1b89a409540..41c1a8ac7bd 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
@@ -72,6 +72,11 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         doTest("compiler/testData/loadJava/ClassWithTypePRefSelf.java");
     }
     
+    @TestMetadata("ClassWithTypePRefSelfAndClass.java")
+    public void testClassWithTypePRefSelfAndClass() throws Exception {
+        doTest("compiler/testData/loadJava/ClassWithTypePRefSelfAndClass.java");
+    }
+    
     @TestMetadata("FieldAsVar.java")
     public void testFieldAsVar() throws Exception {
         doTest("compiler/testData/loadJava/FieldAsVar.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 1a6581cf1ad..207adfd55cf 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
@@ -1041,6 +1041,11 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
             doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/ClassWithTypePRefSelf.kt");
         }
         
+        @TestMetadata("ClassWithTypePRefSelfAndClass.kt")
+        public void testClassWithTypePRefSelfAndClass() throws Exception {
+            doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/ClassWithTypePRefSelfAndClass.kt");
+        }
+        
         @TestMetadata("FieldAsVar.kt")
         public void testFieldAsVar() throws Exception {
             doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/FieldAsVar.kt");