diff --git a/idea/testData/codegen/bottles.jet b/idea/testData/codegen/bottles.jet
new file mode 100644
index 00000000000..077257e21dd
--- /dev/null
+++ b/idea/testData/codegen/bottles.jet
@@ -0,0 +1,7 @@
+fun main() {
+    var bottles = 99;
+    while(bottles > 0) {
+        System.out?.println("bottles of beer on the wall");
+        bottles--;
+    }
+}
diff --git a/idea/testData/codegen/bottles2.jet b/idea/testData/codegen/bottles2.jet
new file mode 100644
index 00000000000..da885824b9f
--- /dev/null
+++ b/idea/testData/codegen/bottles2.jet
@@ -0,0 +1,7 @@
+fun main() {
+    var bottles = 99;
+    while(bottles > 0) {
+        System.out?.println("bottles of beer on the wall");
+        bottles -= 1;
+    }
+}
diff --git a/idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java b/idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
index 1b1361450cb..9c6980c355a 100644
--- a/idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
+++ b/idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
@@ -478,6 +478,20 @@ public class NamespaceGenTest extends LightCodeInsightFixtureTestCase {
         assertTrue(hadException);
     }
 
+    public void _testBottlesNeedToDistinguishExpressionsStatements() throws Exception {
+        loadFile("bottles.jet");
+        System.out.println(generateToText());
+        final Method main = generateFunction();
+        main.invoke(null);  // ensure no exception
+    }
+
+    public void testBottles2() throws Exception {
+        loadFile("bottles2.jet");
+        System.out.println(generateToText());
+        final Method main = generateFunction();
+        main.invoke(null);  // ensure no exception
+    }
+
     private void binOpTest(final String text, final Object arg1, final Object arg2, final Object expected) throws Exception {
         loadText(text);
         System.out.println(generateToText());