diff --git a/idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java b/idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
index 1dca114e81b..e64bb1d263c 100644
--- a/idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
+++ b/idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
@@ -207,6 +207,13 @@ public class NamespaceGenTest extends LightCodeInsightFixtureTestCase {
         assertEquals(10, main.invoke(null, "false"));
     }
 
+    public void testBoxedInt() throws Exception {
+        loadText("fun foo(a: Int?): Int = if (a != null) a else 239");
+        final Method main = generateFunction();
+        assertEquals(610, main.invoke(null, 610));
+        assertEquals(239, main.invoke(null, new Object[] { null }));
+    }
+
     private void binOpTest(final String text, final int arg1, final int arg2, final int expected) throws Exception {
         loadText(text);
         System.out.println(generateToText());