diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.fir.kt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.fir.kt
index b2c06bdd860..d650cc08a82 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.fir.kt
@@ -1,4 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -PARAMETER_NAME_CHANGED_ON_OVERRIDE
+// SCOPE_DUMP: KA:contains
 
 // FILE: A.java
 abstract public class A implements java.util.Collection<String> {
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.fir.overrides.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.fir.overrides.txt
new file mode 100644
index 00000000000..846c97e9516
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.fir.overrides.txt
@@ -0,0 +1,7 @@
+KA:
+  [Source]: public open override operator fun contains(x: R|kotlin/String|): R|kotlin/Boolean| from Use site scope of /KA [id: 0]
+    [Enhancement]: public open operator fun contains(x: R|kotlin/String!|): R|kotlin/Boolean| from Java enhancement scope for /A [id: 1]
+      [SubstitutionOverride(DeclarationSite)]: public abstract operator fun contains(element: R|kotlin/String!|): R|kotlin/Boolean| from Substitution scope for [Use site scope of kotlin/collections/MutableCollection] for type A [id: 2]
+        [SubstitutionOverride(DeclarationSite)]: public abstract operator fun contains(element: R|E|): R|kotlin/Boolean| from Use site scope of kotlin/collections/MutableCollection [id: 3]
+          [SubstitutionOverride(DeclarationSite)]: public abstract operator fun contains(element: R|E|): R|kotlin/Boolean| from Substitution scope for [Use site scope of kotlin/collections/Collection] for type kotlin/collections/MutableCollection<E> [id: 3]
+            [Library]: public abstract operator fun contains(element: R|E|): R|kotlin/Boolean| from Use site scope of kotlin/collections/Collection [id: 4]
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.kt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.kt
index 7ed19ccd35c..6775e7e06f3 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.kt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.kt
@@ -1,4 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -PARAMETER_NAME_CHANGED_ON_OVERRIDE
+// SCOPE_DUMP: KA:contains
 
 // FILE: A.java
 abstract public class A implements java.util.Collection<String> {
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.fir.kt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.fir.kt
index a25795d18de..ebaf1e41da5 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.fir.kt
@@ -1,3 +1,4 @@
+// SCOPE_DUMP: Y2:removeAt
 // FILE: X.java
 import org.jetbrains.annotations.NotNull;
 
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.fir.overrides.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.fir.overrides.txt
new file mode 100644
index 00000000000..3932e52d31d
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.fir.overrides.txt
@@ -0,0 +1,6 @@
+Y2:
+  [Source]: public open override operator fun removeAt(index: R|kotlin/Int|): R|kotlin/String| from Use site scope of /Y2 [id: 0]
+    [Enhancement]: public open fun removeAt(index: R|kotlin/Int|): R|kotlin/String!| from Java enhancement scope for /X [id: 1]
+    [Enhancement]: /* hidden due to clash */ public open operator fun removeAt(index: R|kotlin/Int|): R|kotlin/String!| from Java enhancement scope for /X [id: 2]
+      [SubstitutionOverride(DeclarationSite)]: public abstract fun removeAt(index: R|kotlin/Int|): R|kotlin/String!| from Substitution scope for [Use site scope of kotlin/collections/MutableList] for type X [id: 3]
+        [Library]: public abstract fun removeAt(index: R|kotlin/Int|): R|E| from Use site scope of kotlin/collections/MutableList [id: 4]
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.kt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.kt
index e1f345eb934..28f432c7c5e 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.kt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.kt
@@ -1,3 +1,4 @@
+// SCOPE_DUMP: Y2:removeAt
 // FILE: X.java
 import org.jetbrains.annotations.NotNull;