diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerFirTestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerFirTestdataTestGenerated.java
index eafb1b1d329..e1f957f159f 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerFirTestdataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerFirTestdataTestGenerated.java
@@ -5288,6 +5288,12 @@ public class DiagnosisCompilerFirTestdataTestGenerated extends AbstractDiagnosis
                     runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/problems/buildList.kt");
                 }
 
+                @Test
+                @TestMetadata("buildListLazy.kt")
+                public void testBuildListLazy() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/problems/buildListLazy.kt");
+                }
+
                 @Test
                 @TestMetadata("buildSetWithVisitor.kt")
                 public void testBuildSetWithVisitor() throws Exception {
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/problems/buildListLazy.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/problems/buildListLazy.fir.txt
new file mode 100644
index 00000000000..b24613a93c9
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/problems/buildListLazy.fir.txt
@@ -0,0 +1,41 @@
+FILE: buildListLazy.kt
+    public final data class NameAndSafeValue : R|kotlin/Any| {
+        public constructor(name: R|kotlin/String|, value: R|kotlin/Int|): R|NameAndSafeValue| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final val name: R|kotlin/String| = R|<local>/name|
+            public get(): R|kotlin/String|
+
+        public final val value: R|kotlin/Int| = R|<local>/value|
+            public get(): R|kotlin/Int|
+
+        public final operator fun component1(): R|kotlin/String|
+
+        public final operator fun component2(): R|kotlin/Int|
+
+        public final fun copy(name: R|kotlin/String| = this@R|/NameAndSafeValue|.R|/NameAndSafeValue.name|, value: R|kotlin/Int| = this@R|/NameAndSafeValue|.R|/NameAndSafeValue.value|): R|NameAndSafeValue|
+
+    }
+    public final fun getEnv(): R|kotlin/collections/List<NameAndSafeValue>| {
+        ^getEnv R|kotlin/collections/listOf|<R|NameAndSafeValue|>()
+    }
+    private final val environment: R|kotlin/collections/List<NameAndSafeValue>|by R|kotlin/lazy|<R|kotlin/collections/List<NameAndSafeValue>|>(<L> = lazy@fun <anonymous>(): R|kotlin/collections/List<NameAndSafeValue>| <inline=NoInline>  {
+        ^ R|kotlin/collections/buildList|<R|NameAndSafeValue|>(<L> = buildList@fun R|kotlin/collections/MutableList<NameAndSafeValue>|.<anonymous>(): R|kotlin/Unit| <inline=Inline, kind=EXACTLY_ONCE>  {
+            R|/getEnv|().R|kotlin/collections/forEach|<R|NameAndSafeValue|>(<L> = forEach@fun <anonymous>(<destruct>: R|NameAndSafeValue|): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN>  {
+                lval name: R|kotlin/String| = R|<local>/<destruct>|.R|/NameAndSafeValue.component1|()
+                lval value: R|kotlin/Int| = R|<local>/<destruct>|.R|/NameAndSafeValue.component2|()
+                this@R|special/anonymous|.R|kotlin/collections/plusAssign|<R|NameAndSafeValue|>(R|/NameAndSafeValue.NameAndSafeValue|(R|<local>/name|, R|<local>/value|))
+            }
+            )
+            this@R|special/anonymous|.<Inapplicable(INAPPLICABLE): kotlin/collections/sortBy>#<R|NameAndSafeValue|, R|ERROR CLASS: Cannot infer argument for type parameter R|>(<L> = sortBy@fun <anonymous>(it: R|NameAndSafeValue|): <ERROR TYPE REF: Cannot infer argument for type parameter R> <inline=CrossInline, kind=UNKNOWN>  {
+                ^ R|<local>/it|.<Unresolved name: name>#
+            }
+            )
+        }
+        )
+    }
+    )
+        private get(): R|kotlin/collections/List<NameAndSafeValue>| {
+            ^ D|/environment|.R|kotlin/getValue|<R|kotlin/collections/List<NameAndSafeValue>|>(Null(null), ::R|/environment|)
+        }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/problems/buildListLazy.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/problems/buildListLazy.kt
new file mode 100644
index 00000000000..9913c674a08
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/problems/buildListLazy.kt
@@ -0,0 +1,12 @@
+data class NameAndSafeValue(val name: String, val value: Int)
+
+fun getEnv() = listOf<NameAndSafeValue>()
+
+private val environment: List<NameAndSafeValue> by lazy {
+    buildList {
+        getEnv().forEach { (name, value) ->
+            this += NameAndSafeValue(name, value)
+        }
+        sortBy { <!ARGUMENT_TYPE_MISMATCH!>it.<!UNRESOLVED_REFERENCE!>name<!><!> }
+    }
+}
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java
index 7bd7d21ea62..9ca356b10fa 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java
@@ -5288,6 +5288,12 @@ public class FirDiagnosticTestGenerated extends AbstractFirDiagnosticTest {
                     runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/problems/buildList.kt");
                 }
 
+                @Test
+                @TestMetadata("buildListLazy.kt")
+                public void testBuildListLazy() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/problems/buildListLazy.kt");
+                }
+
                 @Test
                 @TestMetadata("buildSetWithVisitor.kt")
                 public void testBuildSetWithVisitor() throws Exception {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java
index c589ca72009..d5bd6719bbf 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java
@@ -5288,6 +5288,12 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
                     runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/problems/buildList.kt");
                 }
 
+                @Test
+                @TestMetadata("buildListLazy.kt")
+                public void testBuildListLazy() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/problems/buildListLazy.kt");
+                }
+
                 @Test
                 @TestMetadata("buildSetWithVisitor.kt")
                 public void testBuildSetWithVisitor() throws Exception {