diff --git a/compiler/testData/codegen/box/regressions/kt3587.kt b/compiler/testData/codegen/box/regressions/kt3587.kt
new file mode 100644
index 00000000000..3e1d47b1cd9
--- /dev/null
+++ b/compiler/testData/codegen/box/regressions/kt3587.kt
@@ -0,0 +1,10 @@
+open class Variable {
+    val lightVar: LightVariable = if (this is LightVariable) this else LightVariable()
+}
+
+class LightVariable() : Variable()
+
+fun box(): String {
+    Variable()
+    return "OK"
+}
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
index d7c98e9657a..ea765e46934 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
@@ -6040,6 +6040,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest(fileName);
         }
 
+        @TestMetadata("kt3587.kt")
+        public void testKt3587() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt3587.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("kt3999.kt")
         public void testKt3999() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt3999.kt");