diff --git a/compiler/testData/codegen/box/controlStructures/continueInForCondition.kt b/compiler/testData/codegen/box/controlStructures/continueInForCondition.kt
new file mode 100644
index 00000000000..1ef490e4cf7
--- /dev/null
+++ b/compiler/testData/codegen/box/controlStructures/continueInForCondition.kt
@@ -0,0 +1,12 @@
+import java.util.Arrays
+
+fun foo(): List<String>? = Arrays.asList("abcde")
+
+fun box(): String {
+    for (i in 1..3) {
+        for (value in foo() ?: continue) {
+            if (value != "abcde") return "Fail"
+        }
+    }
+    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 a2d8de9838b..541157bb67c 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
@@ -1299,6 +1299,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             doTest("compiler/testData/codegen/box/controlStructures/continueInFor.kt");
         }
         
+        @TestMetadata("continueInForCondition.kt")
+        public void testContinueInForCondition() throws Exception {
+            doTest("compiler/testData/codegen/box/controlStructures/continueInForCondition.kt");
+        }
+        
         @TestMetadata("continueToLabelInFor.kt")
         public void testContinueToLabelInFor() throws Exception {
             doTest("compiler/testData/codegen/box/controlStructures/continueToLabelInFor.kt");