diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt
index 4ea26ecea81..3909c4424f9 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt
@@ -3,6 +3,6 @@
 trait Foo
 trait Bar
 
-<!CONFLICTING_JVM_DECLARATIONS!>fun <T: Foo> foo(x: T): T where T: Bar<!> {null!!}
+<!CONFLICTING_JVM_DECLARATIONS!>fun <T: Foo> foo(x: T): T<!> where T: Bar {null!!}
 <!CONFLICTING_JVM_DECLARATIONS!>fun foo(x: Foo): Foo<!> {null!!}
 fun foo(x: Bar): Bar {null!!}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt
index 9b6fef49036..e33242be422 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt
@@ -3,6 +3,6 @@
 trait Foo
 trait Bar
 
-<!CONFLICTING_JVM_DECLARATIONS!>fun <T> foo(x: T): T where T: Foo, T: Bar<!> {null!!}
+<!CONFLICTING_JVM_DECLARATIONS!>fun <T> foo(x: T): T<!> where T: Foo, T: Bar {null!!}
 <!CONFLICTING_JVM_DECLARATIONS!>fun foo(x: Foo): Foo<!> {null!!}
 fun foo(x: Bar): Bar {null!!}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.kt
index 65fe42c20bf..16c335a3207 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.kt
@@ -4,5 +4,5 @@ class C {
     <!CONFLICTING_JVM_DECLARATIONS!>fun setX(x: Int)<!> {}
 
     var x: Int = 1
-        <!CONFLICTING_JVM_DECLARATIONS!>set(v) {}<!>
+        <!CONFLICTING_JVM_DECLARATIONS!>set(v)<!> {}
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/defaults.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/defaults.kt
index 80d9e05b14c..56331d96423 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/defaults.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/defaults.kt
@@ -1,6 +1,6 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-<!CONFLICTING_JVM_DECLARATIONS!>class C<!> {
+class <!CONFLICTING_JVM_DECLARATIONS!>C<!> {
     <!CONFLICTING_JVM_DECLARATIONS!>fun `a$default`(c: C, x: Int, m: Int)<!> {}
     fun a(x: Int = 1) {}
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt
index 2b8f91b2fa1..7716c2409c9 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class C {
-    <!CONFLICTING_JVM_DECLARATIONS!>inner class D<!> {
+    inner class <!CONFLICTING_JVM_DECLARATIONS!>D<!> {
         <!CONFLICTING_JVM_DECLARATIONS!>val `this$0`: C?<!> = null
     }
 }
\ No newline at end of file