diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt
new file mode 100644
index 00000000000..2dd47549c49
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt
@@ -0,0 +1,5 @@
+class C {
+    class object {}
+
+    <!CONFLICTING_JVM_DECLARATIONS!>val `object$`<!> = C
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt
new file mode 100644
index 00000000000..d90d6c1d37f
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt
@@ -0,0 +1,3 @@
+object <!CONFLICTING_JVM_DECLARATIONS!>O<!> {
+    <!CONFLICTING_JVM_DECLARATIONS!>val `instance$`: O<!> = null!!
+}
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
index 39f2b3e93ce..169b434e2fe 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -2835,6 +2835,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames"), Pattern.compile("^(.+)\\.kt$"), true);
                 }
                 
+                @TestMetadata("classObject.kt")
+                public void testClassObject() throws Exception {
+                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt");
+                }
+                
                 @TestMetadata("dataClassCopy.kt")
                 public void testDataClassCopy() throws Exception {
                     doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.kt");
@@ -2855,6 +2860,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                     doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt");
                 }
                 
+                @TestMetadata("instance.kt")
+                public void testInstance() throws Exception {
+                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt");
+                }
+                
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl")