diff --git a/compiler/testData/loadJava/UnboundWildcard.java b/compiler/testData/loadJava/UnboundWildcard.java
new file mode 100644
index 00000000000..94399f1eb9f
--- /dev/null
+++ b/compiler/testData/loadJava/UnboundWildcard.java
@@ -0,0 +1,10 @@
+package test;
+
+public final class UnboundWildcard {
+    public final MyClass<?> foo() {
+        throw new UnsupportedOperationException();
+    }
+
+    public interface MyClass<T extends CharSequence> {
+    }
+}
diff --git a/compiler/testData/loadJava/UnboundWildcard.kt b/compiler/testData/loadJava/UnboundWildcard.kt
new file mode 100644
index 00000000000..5e7930dd54b
--- /dev/null
+++ b/compiler/testData/loadJava/UnboundWildcard.kt
@@ -0,0 +1,7 @@
+package test
+
+public final class UnboundWildcard: Object() {
+    public final fun foo(): MyClass<*>? = throw UnsupportedOperationException()
+
+    public trait MyClass<T: CharSequence?>: Object
+}
diff --git a/compiler/testData/loadJava/UnboundWildcard.txt b/compiler/testData/loadJava/UnboundWildcard.txt
new file mode 100644
index 00000000000..ede768f6e6d
--- /dev/null
+++ b/compiler/testData/loadJava/UnboundWildcard.txt
@@ -0,0 +1,8 @@
+namespace test
+
+public final class test.UnboundWildcard : java.lang.Object {
+    public final /*constructor*/ fun <init>(): test.UnboundWildcard
+    public final fun foo(): test.UnboundWildcard.MyClass<out jet.CharSequence?>?
+    public abstract trait test.UnboundWildcard.MyClass</*0*/ T : jet.CharSequence?> : java.lang.Object {
+    }
+}
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
index e2fd602cdce..89eedfa5292 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
@@ -149,6 +149,11 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         doTest("compiler/testData/loadJava/TwoFields.java");
     }
     
+    @TestMetadata("UnboundWildcard.java")
+    public void testUnboundWildcard() throws Exception {
+        doTest("compiler/testData/loadJava/UnboundWildcard.java");
+    }
+    
     @TestMetadata("compiler/testData/loadJava/annotation")
     public static class Annotation extends AbstractLoadJavaTest {
         public void testAllFilesPresentInAnnotation() throws Exception {
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 1390af34e33..2c4e2a886cd 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
@@ -1039,6 +1039,11 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
             doTestSinglePackage("compiler/testData/loadJava/TwoFields.kt");
         }
         
+        @TestMetadata("UnboundWildcard.kt")
+        public void testUnboundWildcard() throws Exception {
+            doTestSinglePackage("compiler/testData/loadJava/UnboundWildcard.kt");
+        }
+        
         @TestMetadata("compiler/testData/loadJava/annotation")
         public static class Annotation extends AbstractLazyResolveNamespaceComparingTest {
             public void testAllFilesPresentInAnnotation() throws Exception {