diff --git a/idea/testData/completion/injava/NestedClassMembers.java b/idea/testData/completion/injava/NestedClassMembers.java
new file mode 100644
index 00000000000..597cfbc069b
--- /dev/null
+++ b/idea/testData/completion/injava/NestedClassMembers.java
@@ -0,0 +1,8 @@
+public class Testing {
+    public static void test(mockLib.foo.LibClass.Nested p) {
+        p.<caret>
+    }
+}
+
+// EXIST: getValInNested
+// EXIST: funInNested
diff --git a/idea/testData/completion/injava/NestedClassMembers2.java b/idea/testData/completion/injava/NestedClassMembers2.java
new file mode 100644
index 00000000000..4c6846bf963
--- /dev/null
+++ b/idea/testData/completion/injava/NestedClassMembers2.java
@@ -0,0 +1,8 @@
+public class Testing {
+    public static void test(mockLib.foo.LibClass p) {
+        p.getNested().<caret>
+    }
+}
+
+// EXIST: getValInNested
+// EXIST: funInNested
diff --git a/idea/testData/completion/injava/ObjectInClassObjects.java b/idea/testData/completion/injava/ObjectInClassObjects.java
new file mode 100644
index 00000000000..2e4379c1d2b
--- /dev/null
+++ b/idea/testData/completion/injava/ObjectInClassObjects.java
@@ -0,0 +1,7 @@
+public class Testing {
+    public static void test() {
+        mockLib.foo.F.object.F.object.<caret>
+    }
+}
+
+// EXIST: F
diff --git a/idea/testData/completion/injava/mockLib/main.kt b/idea/testData/completion/injava/mockLib/main.kt
index a1c9aab7bdd..2bb79a7bcef 100644
--- a/idea/testData/completion/injava/mockLib/main.kt
+++ b/idea/testData/completion/injava/mockLib/main.kt
@@ -11,7 +11,13 @@ public class LibClass {
         public object NestedObject
     }
 
-    public class Nested
+    public class Nested {
+        public val valInNested: Int = 1
+        public fun funInNested() {
+        }
+    }
+
+    public val nested: Nested = Nested()
 }
 
 public trait LibTrait {
@@ -33,3 +39,13 @@ public fun String.topLevelExtFunction(): String = ""
 
 public var topLevelVar: String = ""
 
+class F() {
+    class object {
+        class F {
+            class object {
+                object F {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java
index 2b82d140f79..84f692d7640 100644
--- a/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java
@@ -73,12 +73,30 @@ public class CompiledKotlinInJavaCompletionTestGenerated extends AbstractCompile
         doTest(fileName);
     }
 
+    @TestMetadata("NestedClassMembers.java")
+    public void testNestedClassMembers() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/NestedClassMembers.java");
+        doTest(fileName);
+    }
+
+    @TestMetadata("NestedClassMembers2.java")
+    public void testNestedClassMembers2() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/NestedClassMembers2.java");
+        doTest(fileName);
+    }
+
     @TestMetadata("NestedObjectInstance.java")
     public void testNestedObjectInstance() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/NestedObjectInstance.java");
         doTest(fileName);
     }
 
+    @TestMetadata("ObjectInClassObjects.java")
+    public void testObjectInClassObjects() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/ObjectInClassObjects.java");
+        doTest(fileName);
+    }
+
     @TestMetadata("ObjectInstance.java")
     public void testObjectInstance() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/ObjectInstance.java");
diff --git a/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java
index 44276d8790c..ecaf04d9cd3 100644
--- a/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java
@@ -73,12 +73,30 @@ public class KotlinSourceInJavaCompletionTestGenerated extends AbstractKotlinSou
         doTest(fileName);
     }
 
+    @TestMetadata("NestedClassMembers.java")
+    public void testNestedClassMembers() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/NestedClassMembers.java");
+        doTest(fileName);
+    }
+
+    @TestMetadata("NestedClassMembers2.java")
+    public void testNestedClassMembers2() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/NestedClassMembers2.java");
+        doTest(fileName);
+    }
+
     @TestMetadata("NestedObjectInstance.java")
     public void testNestedObjectInstance() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/NestedObjectInstance.java");
         doTest(fileName);
     }
 
+    @TestMetadata("ObjectInClassObjects.java")
+    public void testObjectInClassObjects() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/ObjectInClassObjects.java");
+        doTest(fileName);
+    }
+
     @TestMetadata("ObjectInstance.java")
     public void testObjectInstance() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/ObjectInstance.java");