diff --git a/compiler/testData/codegen/box/bridges/objectClone.kt b/compiler/testData/codegen/box/bridges/objectClone.kt
index df0059ec3ef..b6c5f2cf4ee 100644
--- a/compiler/testData/codegen/box/bridges/objectClone.kt
+++ b/compiler/testData/codegen/box/bridges/objectClone.kt
@@ -1,5 +1,6 @@
 // TARGET_BACKEND: JVM
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61751
+
 import java.util.HashSet
 
 interface A : Set<String>
diff --git a/compiler/testData/codegen/box/classes/inheritSetAndHashSet.kt b/compiler/testData/codegen/box/classes/inheritSetAndHashSet.kt
index 5677c3d06ec..2dd7ffbca90 100644
--- a/compiler/testData/codegen/box/classes/inheritSetAndHashSet.kt
+++ b/compiler/testData/codegen/box/classes/inheritSetAndHashSet.kt
@@ -1,7 +1,7 @@
 // IGNORE_BACKEND: WASM
 // WASM_MUTE_REASON: STDLIB_COLLECTION_INHERITANCE
 // KJS_WITH_FULL_RUNTIME
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61751
 // DONT_TARGET_EXACT_BACKEND: NATIVE
 
 interface A : Set<String>
diff --git a/compiler/testData/codegen/box/collections/inheritFromAbstractMutableListInt.kt b/compiler/testData/codegen/box/collections/inheritFromAbstractMutableListInt.kt
index 0261b7f6066..f643ecbb622 100644
--- a/compiler/testData/codegen/box/collections/inheritFromAbstractMutableListInt.kt
+++ b/compiler/testData/codegen/box/collections/inheritFromAbstractMutableListInt.kt
@@ -1,5 +1,5 @@
 // WITH_STDLIB
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61751
 
 abstract class A : AbstractMutableList<Int>()
 
diff --git a/compiler/testData/codegen/box/collections/noStubsInJavaSuperClass.kt b/compiler/testData/codegen/box/collections/noStubsInJavaSuperClass.kt
index 29c99e29dd8..17da3cd40ee 100644
--- a/compiler/testData/codegen/box/collections/noStubsInJavaSuperClass.kt
+++ b/compiler/testData/codegen/box/collections/noStubsInJavaSuperClass.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61751
 
 // FILE: B.java
 public abstract class B<E> extends A<E> implements L<E> {
diff --git a/compiler/testData/codegen/box/collections/removeAtBridgeClashWithJava.kt b/compiler/testData/codegen/box/collections/removeAtBridgeClashWithJava.kt
index 33c69fd9877..00065f98c92 100644
--- a/compiler/testData/codegen/box/collections/removeAtBridgeClashWithJava.kt
+++ b/compiler/testData/codegen/box/collections/removeAtBridgeClashWithJava.kt
@@ -1,6 +1,6 @@
 // TARGET_BACKEND: JVM
 // WITH_STDLIB
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61751
 // FILE: removeAtBridgeClashWithJava.kt
 
 abstract class AJALI : JavaAbstractList<Int>()
diff --git a/compiler/testData/codegen/box/differentDependencyVersion/kt51194_java.kt b/compiler/testData/codegen/box/differentDependencyVersion/kt51194_java.kt
index 46bf96d5b8c..961000b82d7 100644
--- a/compiler/testData/codegen/box/differentDependencyVersion/kt51194_java.kt
+++ b/compiler/testData/codegen/box/differentDependencyVersion/kt51194_java.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61804
 // ISSUE: KT-51194
 
 // MODULE: coreLib_1
diff --git a/compiler/testData/codegen/box/fir/callableReferenceToJavaField.kt b/compiler/testData/codegen/box/fir/callableReferenceToJavaField.kt
index 3d982d89bde..fcc3efc1b0b 100644
--- a/compiler/testData/codegen/box/fir/callableReferenceToJavaField.kt
+++ b/compiler/testData/codegen/box/fir/callableReferenceToJavaField.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM_IR
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61386
 // DUMP_IR
 // FULL_JDK
 // WITH_REFLECT
diff --git a/compiler/testData/codegen/box/fir/syntheticPropertyThroughJava.kt b/compiler/testData/codegen/box/fir/syntheticPropertyThroughJava.kt
index 4879bfa9af1..90180eaee83 100644
--- a/compiler/testData/codegen/box/fir/syntheticPropertyThroughJava.kt
+++ b/compiler/testData/codegen/box/fir/syntheticPropertyThroughJava.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM_IR
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61805
 // ISSUE: KT-59550
 
 // FILE: Intermediate.java
diff --git a/compiler/testData/codegen/box/fir/syntheticPropertyThroughJavaMultiModule.kt b/compiler/testData/codegen/box/fir/syntheticPropertyThroughJavaMultiModule.kt
index add9ee6da18..aba3e0da66b 100644
--- a/compiler/testData/codegen/box/fir/syntheticPropertyThroughJavaMultiModule.kt
+++ b/compiler/testData/codegen/box/fir/syntheticPropertyThroughJavaMultiModule.kt
@@ -1,6 +1,6 @@
 // TARGET_BACKEND: JVM_IR
 // ISSUE: KT-59550 (related)
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61805
 
 // MODULE: m1
 // FILE: Base.kt
diff --git a/compiler/testData/codegen/box/fir/syntheticPropertyThroughJavaWithSetter.kt b/compiler/testData/codegen/box/fir/syntheticPropertyThroughJavaWithSetter.kt
index d7b255a7411..b077c647610 100644
--- a/compiler/testData/codegen/box/fir/syntheticPropertyThroughJavaWithSetter.kt
+++ b/compiler/testData/codegen/box/fir/syntheticPropertyThroughJavaWithSetter.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM_IR
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61805
 // ISSUE: KT-59550
 
 // FILE: Intermediate.java
diff --git a/compiler/testData/codegen/box/inlineArgsInPlace/arrayDequeRemoveAll.kt b/compiler/testData/codegen/box/inlineArgsInPlace/arrayDequeRemoveAll.kt
index 04192154ff7..b28bbec314c 100644
--- a/compiler/testData/codegen/box/inlineArgsInPlace/arrayDequeRemoveAll.kt
+++ b/compiler/testData/codegen/box/inlineArgsInPlace/arrayDequeRemoveAll.kt
@@ -1,5 +1,5 @@
 // WITH_STDLIB
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61751
 
 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 class ArrayDeque<E> : AbstractMutableList<E> {
diff --git a/compiler/testData/codegen/box/javaInterop/conflictingOverloadsForThrowableInheritors.kt b/compiler/testData/codegen/box/javaInterop/conflictingOverloadsForThrowableInheritors.kt
index 05b17c5d9cc..0cede6a58de 100644
--- a/compiler/testData/codegen/box/javaInterop/conflictingOverloadsForThrowableInheritors.kt
+++ b/compiler/testData/codegen/box/javaInterop/conflictingOverloadsForThrowableInheritors.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61805
 // FULL_JDK
 // ISSUE: KT-45584
 
diff --git a/compiler/testData/codegen/box/javaInterop/conflictingOverloadsForThrowableInheritors2.kt b/compiler/testData/codegen/box/javaInterop/conflictingOverloadsForThrowableInheritors2.kt
index 7918ef9385b..6c3970c4cc7 100644
--- a/compiler/testData/codegen/box/javaInterop/conflictingOverloadsForThrowableInheritors2.kt
+++ b/compiler/testData/codegen/box/javaInterop/conflictingOverloadsForThrowableInheritors2.kt
@@ -1,6 +1,6 @@
 // TARGET_BACKEND: JVM
 // FULL_JDK
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61805
 // ISSUE: KT-45584
 
 // FILE: PlaceholderExceptionSupport.java
diff --git a/compiler/testData/codegen/box/javaInterop/syntheticPropClashingWithJvmField.kt b/compiler/testData/codegen/box/javaInterop/syntheticPropClashingWithJvmField.kt
index 4b8f3b828bb..200f1d68364 100644
--- a/compiler/testData/codegen/box/javaInterop/syntheticPropClashingWithJvmField.kt
+++ b/compiler/testData/codegen/box/javaInterop/syntheticPropClashingWithJvmField.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61805
 // WITH_STDLIB
 // ISSUE: KT-56538
 
diff --git a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeWithJava.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeWithJava.kt
index 85446f53c04..0db8bf59f95 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeWithJava.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/bridgeWithJava.kt
@@ -1,6 +1,6 @@
 // !JVM_DEFAULT_MODE: all-compatibility
 // TARGET_BACKEND: JVM
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61751
 // JVM_TARGET: 1.8
 // WITH_STDLIB
 // FULL_JDK
diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeWithJava.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeWithJava.kt
index c053a259b90..fc9ab0d8d2e 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeWithJava.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeWithJava.kt
@@ -1,6 +1,6 @@
 // !JVM_DEFAULT_MODE: all
 // TARGET_BACKEND: JVM
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61751
 // JVM_TARGET: 1.8
 // WITH_STDLIB
 // FULL_JDK
diff --git a/compiler/testData/codegen/box/sam/partialSam.kt b/compiler/testData/codegen/box/sam/partialSam.kt
index 3ca916e8ce5..211e0d6aa02 100644
--- a/compiler/testData/codegen/box/sam/partialSam.kt
+++ b/compiler/testData/codegen/box/sam/partialSam.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61751
 // WITH_STDLIB
 // FILE: Fn.java
 public interface Fn<T, R> {
diff --git a/compiler/testData/codegen/box/sam/partialSamKT.kt b/compiler/testData/codegen/box/sam/partialSamKT.kt
index 74846e2fe47..a8d615c328f 100644
--- a/compiler/testData/codegen/box/sam/partialSamKT.kt
+++ b/compiler/testData/codegen/box/sam/partialSamKT.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61751
 // WITH_STDLIB
 // FILE: Fn.java
 public interface Fn<T, R> {
diff --git a/compiler/testData/codegen/box/specialBuiltins/complexMapImpl.kt b/compiler/testData/codegen/box/specialBuiltins/complexMapImpl.kt
index e32bccbf105..f9ea7963264 100644
--- a/compiler/testData/codegen/box/specialBuiltins/complexMapImpl.kt
+++ b/compiler/testData/codegen/box/specialBuiltins/complexMapImpl.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61751
 // WITH_STDLIB
 
 // binary representation of fractional part of phi = (sqrt(5) - 1) / 2
diff --git a/compiler/testData/codegen/box/specialBuiltins/specialBridgeModality.kt b/compiler/testData/codegen/box/specialBuiltins/specialBridgeModality.kt
index 39f938a600c..358920f8275 100644
--- a/compiler/testData/codegen/box/specialBuiltins/specialBridgeModality.kt
+++ b/compiler/testData/codegen/box/specialBuiltins/specialBridgeModality.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61751
 
 import java.util.AbstractMap
 
diff --git a/compiler/testData/codegen/box/vararg/varargsOverride.kt b/compiler/testData/codegen/box/vararg/varargsOverride.kt
index 16fff155800..7e136d26b71 100644
--- a/compiler/testData/codegen/box/vararg/varargsOverride.kt
+++ b/compiler/testData/codegen/box/vararg/varargsOverride.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61751
 // MODULE: lib
 // FILE: A.java
 
diff --git a/compiler/testData/codegen/box/vararg/varargsOverride2.kt b/compiler/testData/codegen/box/vararg/varargsOverride2.kt
index 4a8d8ba086f..33051b24287 100644
--- a/compiler/testData/codegen/box/vararg/varargsOverride2.kt
+++ b/compiler/testData/codegen/box/vararg/varargsOverride2.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61751
 // MODULE: lib
 // FILE: A.java
 
diff --git a/compiler/testData/codegen/box/vararg/varargsOverride3.kt b/compiler/testData/codegen/box/vararg/varargsOverride3.kt
index 31d0b824139..a08a503c2c2 100644
--- a/compiler/testData/codegen/box/vararg/varargsOverride3.kt
+++ b/compiler/testData/codegen/box/vararg/varargsOverride3.kt
@@ -1,5 +1,5 @@
 // TARGET_BACKEND: JVM
-// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61370
+// IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-61751
 
 // MODULE: lib
 // FILE: A.java