diff --git a/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.java b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.java
new file mode 100644
index 00000000000..5bc12edf557
--- /dev/null
+++ b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.java
@@ -0,0 +1,14 @@
+package test;
+
+import a.b.c.Outer;
+
+class Test {
+    public static void main(Outer o) {
+        Outer oo = o.o();
+        Outer.Inner oi = o.i();
+        Outer.Nested on = o.n();
+        Outer.Nested.NI oni = o.NI();
+        Outer.Nested.NN onn = o.NN();
+        Outer.Inner.II oii = o.II();
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt
new file mode 100644
index 00000000000..f26dbd037a4
--- /dev/null
+++ b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt
@@ -0,0 +1,18 @@
+package a.b.c
+
+class Outer {
+    class Nested {
+        inner class NI
+        class NN
+    }
+    inner class Inner {
+        inner class II
+    }
+
+    fun o() = Outer()
+    fun n() = Nested()
+    fun i() = Inner()
+    fun II() = Inner().II()
+    fun NI() = Nested().NI()
+    fun NN() = Nested.NN()
+}
diff --git a/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinBinariesCheckerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinBinariesCheckerTestGenerated.java
index 403c1342aee..3698bbd5e16 100644
--- a/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinBinariesCheckerTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinBinariesCheckerTestGenerated.java
@@ -89,6 +89,12 @@ public class JavaAgainstKotlinBinariesCheckerTestGenerated extends AbstractJavaA
         doTest(fileName);
     }
 
+    @TestMetadata("ReturnInnerClasses.kt")
+    public void testReturnInnerClasses() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("TopLevelFunctionInDataFlowInspection.kt")
     public void testTopLevelFunctionInDataFlowInspection() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.kt");
diff --git a/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java
index 10b464d1b6c..5522ed0aa66 100644
--- a/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java
@@ -91,6 +91,12 @@ public class JavaAgainstKotlinSourceCheckerTestGenerated extends AbstractJavaAga
             doTest(fileName);
         }
 
+        @TestMetadata("ReturnInnerClasses.kt")
+        public void testReturnInnerClasses() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("TopLevelFunctionInDataFlowInspection.kt")
         public void testTopLevelFunctionInDataFlowInspection() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.kt");