diff --git a/idea/testData/completion/handlers/ClassFromClassObject.kt b/idea/testData/completion/handlers/ClassFromClassObject.kt
new file mode 100644
index 00000000000..efb330983c4
--- /dev/null
+++ b/idea/testData/completion/handlers/ClassFromClassObject.kt
@@ -0,0 +1,9 @@
+class Test {
+    class object {
+        class Some
+    }
+}
+
+fun test() {
+    Test.S<caret>
+}
\ No newline at end of file
diff --git a/idea/testData/completion/handlers/ClassFromClassObject.kt.after b/idea/testData/completion/handlers/ClassFromClassObject.kt.after
new file mode 100644
index 00000000000..dc8812322ff
--- /dev/null
+++ b/idea/testData/completion/handlers/ClassFromClassObject.kt.after
@@ -0,0 +1,9 @@
+class Test {
+    class object {
+        class Some
+    }
+}
+
+fun test() {
+    Test.Some<caret>
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTest.kt b/idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTest.kt
index 4371424a477..46918dee26b 100644
--- a/idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTest.kt
+++ b/idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTest.kt
@@ -128,4 +128,5 @@ public class BasicCompletionHandlerTest : CompletionHandlerTestBase(){
 
     fun testEnumMember() = doTest(1, "A", null, '\n')
     fun testEnumMember1() = doTest(1, "A", null, '\n')
+    fun testClassFromClassObject() = doTest(1, "Some", null, '\n')
 }
\ No newline at end of file