diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
index e74434b7692..c6321f66dfd 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
@@ -34593,6 +34593,12 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
             runTest("compiler/testData/diagnostics/testsWithStdLib/exitProcess.kt");
         }
 
+        @Test
+        @TestMetadata("genericContainer.kt")
+        public void testGenericContainer() throws Exception {
+            runTest("compiler/testData/diagnostics/testsWithStdLib/genericContainer.kt");
+        }
+
         @Test
         @TestMetadata("greater.kt")
         public void testGreater() throws Exception {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
index d048c6191d7..9cfc3ba2dd4 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
@@ -34593,6 +34593,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
             runTest("compiler/testData/diagnostics/testsWithStdLib/exitProcess.kt");
         }
 
+        @Test
+        @TestMetadata("genericContainer.kt")
+        public void testGenericContainer() throws Exception {
+            runTest("compiler/testData/diagnostics/testsWithStdLib/genericContainer.kt");
+        }
+
         @Test
         @TestMetadata("greater.kt")
         public void testGreater() throws Exception {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
index 29bd7499af0..75b48de4a48 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
@@ -34593,6 +34593,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
             runTest("compiler/testData/diagnostics/testsWithStdLib/exitProcess.kt");
         }
 
+        @Test
+        @TestMetadata("genericContainer.kt")
+        public void testGenericContainer() throws Exception {
+            runTest("compiler/testData/diagnostics/testsWithStdLib/genericContainer.kt");
+        }
+
         @Test
         @TestMetadata("greater.kt")
         public void testGreater() throws Exception {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/genericContainer.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/genericContainer.fir.kt
new file mode 100644
index 00000000000..28a794de436
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithStdLib/genericContainer.fir.kt
@@ -0,0 +1,12 @@
+// FIR_DUMP
+// FILE: GenericContainer.java
+
+public class GenericContainer<SELF extends GenericContainer<SELF>> {
+    public GenericContainer(String dockerImageName) {
+
+    }
+}
+
+// FILE: test.kt
+
+val container = <!NEW_INFERENCE_ERROR!>GenericContainer("nginx")<!>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/genericContainer.fir.txt b/compiler/testData/diagnostics/testsWithStdLib/genericContainer.fir.txt
new file mode 100644
index 00000000000..2372e44ce39
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithStdLib/genericContainer.fir.txt
@@ -0,0 +1,3 @@
+FILE: test.kt
+    public final val container: R|GenericContainer<out ft<GenericContainer<*>, GenericContainer<*>?>>| = <CS errors: /GenericContainer.GenericContainer>#<R|CapturedType(*)|>(String(nginx))
+        public get(): R|GenericContainer<out ft<GenericContainer<*>, GenericContainer<*>?>>|
diff --git a/compiler/testData/diagnostics/testsWithStdLib/genericContainer.kt b/compiler/testData/diagnostics/testsWithStdLib/genericContainer.kt
new file mode 100644
index 00000000000..0fe17c59528
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithStdLib/genericContainer.kt
@@ -0,0 +1,12 @@
+// FIR_DUMP
+// FILE: GenericContainer.java
+
+public class GenericContainer<SELF extends GenericContainer<SELF>> {
+    public GenericContainer(String dockerImageName) {
+
+    }
+}
+
+// FILE: test.kt
+
+val container = GenericContainer("nginx")
diff --git a/compiler/testData/diagnostics/testsWithStdLib/genericContainer.txt b/compiler/testData/diagnostics/testsWithStdLib/genericContainer.txt
new file mode 100644
index 00000000000..e929ca52cf6
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithStdLib/genericContainer.txt
@@ -0,0 +1,10 @@
+package
+
+public val container: GenericContainer<out GenericContainer<*>!>
+
+public open class GenericContainer</*0*/ SELF : GenericContainer<SELF!>!> {
+    public constructor GenericContainer</*0*/ SELF : GenericContainer<SELF!>!>(/*0*/ dockerImageName: kotlin.String!)
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
index f0de560cc42..31ea410e471 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
@@ -34683,6 +34683,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
             runTest("compiler/testData/diagnostics/testsWithStdLib/exitProcess.kt");
         }
 
+        @Test
+        @TestMetadata("genericContainer.kt")
+        public void testGenericContainer() throws Exception {
+            runTest("compiler/testData/diagnostics/testsWithStdLib/genericContainer.kt");
+        }
+
         @Test
         @TestMetadata("greater.kt")
         public void testGreater() throws Exception {