diff --git a/compiler/testData/diagnostics/tests/smartCasts/loops/whileNullAssignToSomething.kt b/compiler/testData/diagnostics/tests/smartCasts/loops/whileNullAssignToSomething.kt
new file mode 100644
index 00000000000..44bb1f3ef76
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/smartCasts/loops/whileNullAssignToSomething.kt
@@ -0,0 +1,9 @@
+fun main(args: Array<String>) {
+    var result: String? = null
+    var i = 0
+    while (result == null) {
+        if (i == 10) result = "non null"
+        else i++
+    }
+    result<!UNSAFE_CALL!>.<!>length
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/smartCasts/loops/whileNullAssignToSomething.txt b/compiler/testData/diagnostics/tests/smartCasts/loops/whileNullAssignToSomething.txt
new file mode 100644
index 00000000000..49ba831837b
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/smartCasts/loops/whileNullAssignToSomething.txt
@@ -0,0 +1,3 @@
+package
+
+public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
index 42cd7a672e1..08ffa1ca2ab 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
@@ -19916,6 +19916,11 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                     runTest("compiler/testData/diagnostics/tests/smartCasts/loops/whileNull.kt");
                 }
 
+                @TestMetadata("whileNullAssignToSomething.kt")
+                public void testWhileNullAssignToSomething() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/smartCasts/loops/whileNullAssignToSomething.kt");
+                }
+
                 @TestMetadata("whileNullWithBreak.kt")
                 public void testWhileNullWithBreak() throws Exception {
                     runTest("compiler/testData/diagnostics/tests/smartCasts/loops/whileNullWithBreak.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
index 3a792aaaf12..5dc75534483 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
@@ -19916,6 +19916,11 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                     runTest("compiler/testData/diagnostics/tests/smartCasts/loops/whileNull.kt");
                 }
 
+                @TestMetadata("whileNullAssignToSomething.kt")
+                public void testWhileNullAssignToSomething() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/smartCasts/loops/whileNullAssignToSomething.kt");
+                }
+
                 @TestMetadata("whileNullWithBreak.kt")
                 public void testWhileNullWithBreak() throws Exception {
                     runTest("compiler/testData/diagnostics/tests/smartCasts/loops/whileNullWithBreak.kt");