diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java
index 1b7499558bc..ad2dbcc089f 100644
--- a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java
+++ b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java
@@ -1762,6 +1762,11 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
             doTest("j2k/tests/testData/ast/issues/kt-794-mixed.java");
         }
         
+        @TestMetadata("kt-807.java")
+        public void testKt_807() throws Exception {
+            doTest("j2k/tests/testData/ast/issues/kt-807.java");
+        }
+        
         @TestMetadata("kt-809.java")
         public void testKt_809() throws Exception {
             doTest("j2k/tests/testData/ast/issues/kt-809.java");
@@ -1837,6 +1842,11 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
             doTest("j2k/tests/testData/ast/issues/kt-893.java");
         }
         
+        @TestMetadata("kt-899.java")
+        public void testKt_899() throws Exception {
+            doTest("j2k/tests/testData/ast/issues/kt-899.java");
+        }
+        
         @TestMetadata("kt-963.java")
         public void testKt_963() throws Exception {
             doTest("j2k/tests/testData/ast/issues/kt-963.java");
diff --git a/j2k/tests/testData/ast/issues/kt-807.java b/j2k/tests/testData/ast/issues/kt-807.java
new file mode 100644
index 00000000000..c1462ed4b14
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-807.java
@@ -0,0 +1,17 @@
+//file
+import java.io.*;
+
+class FileRead {
+    public static void main(String args[]) {
+        try {
+            FileInputStream fstream = new FileInputStream("textfile.txt");
+            DataInputStream in = new DataInputStream(fstream);
+            BufferedReader br = new BufferedReader(new InputStreamReader(in));
+            String strLine;
+            while ((strLine = br.readLine()) != null) { System.out.println (strLine); }
+            in.close();
+        } catch (Exception e) {
+            System.err.println("Error: " + e.getMessage());
+        }
+    }
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/kt-807.kt b/j2k/tests/testData/ast/issues/kt-807.kt
new file mode 100644
index 00000000000..f2978c811c2
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-807.kt
@@ -0,0 +1,23 @@
+import java.io.*
+
+class FileRead {
+    class object {
+        public fun main(args: Array<String>) {
+            try {
+                val fstream = FileInputStream("textfile.txt")
+                val `in` = DataInputStream(fstream)
+                val br = BufferedReader(InputStreamReader(`in`))
+                val strLine: String
+                while ((strLine = br.readLine()) != null) {
+                    System.out.println(strLine)
+                }
+                `in`.close()
+            } catch (e: Exception) {
+                System.err.println("Error: " + e.getMessage())
+            }
+
+        }
+    }
+}
+
+fun main(args: Array<String>) = FileRead.main(args)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/kt-899.java b/j2k/tests/testData/ast/issues/kt-899.java
new file mode 100644
index 00000000000..7e89d88ffba
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-899.java
@@ -0,0 +1,7 @@
+//file
+class Test {
+    public void printNumbers(int number) {
+        for(int i = 2; i < Math.sqrt(number) + 1; i++)
+            System.out.println(i);
+    }
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/kt-899.kt b/j2k/tests/testData/ast/issues/kt-899.kt
new file mode 100644
index 00000000000..f03fd808c71
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-899.kt
@@ -0,0 +1,6 @@
+class Test {
+    public fun printNumbers(number: Int) {
+        for (i in 2..Math.sqrt(number.toDouble()) + 1 - 1)
+            System.out.println(i)
+    }
+}
\ No newline at end of file