diff --git a/compiler/testData/diagnostics/tests/when/withSubjectVariable/unusedWhenSubjectVariable.kt b/compiler/testData/diagnostics/tests/when/withSubjectVariable/unusedWhenSubjectVariable.kt
new file mode 100644
index 00000000000..80a72a95fdc
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/when/withSubjectVariable/unusedWhenSubjectVariable.kt
@@ -0,0 +1,8 @@
+// !LANGUAGE: +VariableDeclarationInWhenSubject
+
+fun foo(): Any = 42
+
+fun test() {
+    when (val <!UNUSED_VARIABLE!>x<!> = foo()) {
+    }
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/when/withSubjectVariable/unusedWhenSubjectVariable.txt b/compiler/testData/diagnostics/tests/when/withSubjectVariable/unusedWhenSubjectVariable.txt
new file mode 100644
index 00000000000..0a6ea9911a7
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/when/withSubjectVariable/unusedWhenSubjectVariable.txt
@@ -0,0 +1,4 @@
+package
+
+public fun foo(): kotlin.Any
+public fun test(): kotlin.Unit
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
index d1bc4ab3557..9e7645d2486 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
@@ -22501,6 +22501,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                     String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/withSubjectVariable/unsupportedVariableDeclarationsInWhenSubject.kt");
                     doTest(fileName);
                 }
+
+                @TestMetadata("unusedWhenSubjectVariable.kt")
+                public void testUnusedWhenSubjectVariable() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/withSubjectVariable/unusedWhenSubjectVariable.kt");
+                    doTest(fileName);
+                }
             }
         }
     }
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
index c0a5d132225..ddcb85d9f8d 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
@@ -22501,6 +22501,12 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                     String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/withSubjectVariable/unsupportedVariableDeclarationsInWhenSubject.kt");
                     doTest(fileName);
                 }
+
+                @TestMetadata("unusedWhenSubjectVariable.kt")
+                public void testUnusedWhenSubjectVariable() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/withSubjectVariable/unusedWhenSubjectVariable.kt");
+                    doTest(fileName);
+                }
             }
         }
     }