diff --git a/compiler/testData/diagnostics/testsWithJdk21/newListMethods.fir.kt b/compiler/testData/diagnostics/testsWithJdk21/newListMethods.fir.kt
index b083f00c234..58b5287e7be 100644
--- a/compiler/testData/diagnostics/testsWithJdk21/newListMethods.fir.kt
+++ b/compiler/testData/diagnostics/testsWithJdk21/newListMethods.fir.kt
@@ -57,3 +57,6 @@ fun foo(x: MutableList<String>, y: ArrayList<String>, z: A<String>) {
     z.<!DEBUG_INFO_CALL("fqName: A.removeLast; typeCall: function")!>removeLast()<!>
     z.<!DEBUG_INFO_CALL("fqName: kotlin.collections.reversed; typeCall: extension function")!>reversed()<!>
 }
+
+// DIAGNOSTICS: -JAVA_MODULE_DOES_NOT_EXPORT_PACKAGE
+// accidentally reported (K1 only) on x.addFirst/addLast/removeFirst/removeLast (no such diagnostics on y and z)
diff --git a/compiler/testData/diagnostics/testsWithJdk21/newListMethods.kt b/compiler/testData/diagnostics/testsWithJdk21/newListMethods.kt
index cb8756d046c..2bc052119b7 100644
--- a/compiler/testData/diagnostics/testsWithJdk21/newListMethods.kt
+++ b/compiler/testData/diagnostics/testsWithJdk21/newListMethods.kt
@@ -57,3 +57,6 @@ fun foo(x: MutableList<String>, y: ArrayList<String>, z: A<String>) {
     z.<!DEBUG_INFO_CALL("fqName: A.removeLast; typeCall: function")!>removeLast()<!>
     z.<!DEBUG_INFO_CALL("fqName: kotlin.collections.reversed; typeCall: extension function")!>reversed()<!>
 }
+
+// DIAGNOSTICS: -JAVA_MODULE_DOES_NOT_EXPORT_PACKAGE
+// accidentally reported (K1 only) on x.addFirst/addLast/removeFirst/removeLast (no such diagnostics on y and z)
diff --git a/compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.fir.kt b/compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.fir.kt
index 94da924880d..3bdc8338e1d 100644
--- a/compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.fir.kt
+++ b/compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.fir.kt
@@ -2,8 +2,8 @@
 // WITH_STDLIB
 
 fun bar(x: List<String>) {
-    x.addFirst("")
-    x.addLast("")
-    x.removeFirst()
-    x.removeLast()
-}
\ No newline at end of file
+    x.<!UNRESOLVED_REFERENCE!>addFirst<!>("")
+    x.<!UNRESOLVED_REFERENCE!>addLast<!>("")
+    x.<!UNRESOLVED_REFERENCE!>removeFirst<!>()
+    x.<!UNRESOLVED_REFERENCE!>removeLast<!>()
+}
diff --git a/compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.kt b/compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.kt
index 2ada693876e..01cbc3a7a44 100644
--- a/compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.kt
+++ b/compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.kt
@@ -2,8 +2,8 @@
 // WITH_STDLIB
 
 fun bar(x: List<String>) {
-    x.<!JAVA_MODULE_DOES_NOT_EXPORT_PACKAGE!>addFirst<!>("")
-    x.<!JAVA_MODULE_DOES_NOT_EXPORT_PACKAGE!>addLast<!>("")
-    x.<!JAVA_MODULE_DOES_NOT_EXPORT_PACKAGE!>removeFirst<!>()
-    x.<!JAVA_MODULE_DOES_NOT_EXPORT_PACKAGE!>removeLast<!>()
+    x.<!UNRESOLVED_REFERENCE!>addFirst<!>("")
+    x.<!UNRESOLVED_REFERENCE!>addLast<!>("")
+    x.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>removeFirst<!>()
+    x.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>removeLast<!>()
 }
diff --git a/core/compiler.common.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsSignatures.kt b/core/compiler.common.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsSignatures.kt
index 51923154de7..12af08b1939 100644
--- a/core/compiler.common.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsSignatures.kt
+++ b/core/compiler.common.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsSignatures.kt
@@ -136,7 +136,15 @@ object JvmBuiltInsSignatures {
         signatures {
             inJavaUtil("Collection", "removeIf(Ljava/util/function/Predicate;)Z") +
 
-                    inJavaUtil("List", "replaceAll(Ljava/util/function/UnaryOperator;)V", "sort(Ljava/util/Comparator;)V") +
+                    inJavaUtil(
+                        "List",
+                        "replaceAll(Ljava/util/function/UnaryOperator;)V",
+                        "sort(Ljava/util/Comparator;)V",
+                        "addFirst(Ljava/lang/Object;)V",
+                        "addLast(Ljava/lang/Object;)V",
+                        "removeFirst()Ljava/lang/Object;",
+                        "removeLast()Ljava/lang/Object;",
+                    ) +
 
                     inJavaUtil(
                         "Map",