diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeJdk21DiagnosticTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeJdk21DiagnosticTestGenerated.java
index 8de4486234c..875a2ec6e64 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeJdk21DiagnosticTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeJdk21DiagnosticTestGenerated.java
@@ -36,6 +36,12 @@ public class FirLightTreeJdk21DiagnosticTestGenerated extends AbstractFirLightTr
         runTest("compiler/testData/diagnostics/testsWithJdk21/newListMethods.kt");
     }
 
+    @Test
+    @TestMetadata("newListMethodsImmutable.kt")
+    public void testNewListMethodsImmutable() throws Exception {
+        runTest("compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.kt");
+    }
+
     @Test
     @TestMetadata("noFalsePositiveAbstractToArray.kt")
     public void testNoFalsePositiveAbstractToArray() throws Exception {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiJdk21DiagnosticTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiJdk21DiagnosticTestGenerated.java
index e1413d221e8..43270ec8859 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiJdk21DiagnosticTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiJdk21DiagnosticTestGenerated.java
@@ -36,6 +36,12 @@ public class FirPsiJdk21DiagnosticTestGenerated extends AbstractFirPsiJdk21Diagn
         runTest("compiler/testData/diagnostics/testsWithJdk21/newListMethods.kt");
     }
 
+    @Test
+    @TestMetadata("newListMethodsImmutable.kt")
+    public void testNewListMethodsImmutable() throws Exception {
+        runTest("compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.kt");
+    }
+
     @Test
     @TestMetadata("noFalsePositiveAbstractToArray.kt")
     public void testNoFalsePositiveAbstractToArray() throws Exception {
diff --git a/compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.fir.kt b/compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.fir.kt
new file mode 100644
index 00000000000..94da924880d
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.fir.kt
@@ -0,0 +1,9 @@
+// ISSUE: KT-64640
+// WITH_STDLIB
+
+fun bar(x: List<String>) {
+    x.addFirst("")
+    x.addLast("")
+    x.removeFirst()
+    x.removeLast()
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.kt b/compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.kt
new file mode 100644
index 00000000000..2ada693876e
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.kt
@@ -0,0 +1,9 @@
+// ISSUE: KT-64640
+// 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<!>()
+}
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/Jdk21DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/Jdk21DiagnosticTestGenerated.java
index 50a204f0475..40207fab696 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/Jdk21DiagnosticTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/Jdk21DiagnosticTestGenerated.java
@@ -36,6 +36,12 @@ public class Jdk21DiagnosticTestGenerated extends AbstractJdk21DiagnosticTest {
         runTest("compiler/testData/diagnostics/testsWithJdk21/newListMethods.kt");
     }
 
+    @Test
+    @TestMetadata("newListMethodsImmutable.kt")
+    public void testNewListMethodsImmutable() throws Exception {
+        runTest("compiler/testData/diagnostics/testsWithJdk21/newListMethodsImmutable.kt");
+    }
+
     @Test
     @TestMetadata("noFalsePositiveAbstractToArray.kt")
     public void testNoFalsePositiveAbstractToArray() throws Exception {