diff --git a/compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2216.jet b/compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2216.jet
new file mode 100644
index 00000000000..4fccab1539d
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2216.jet
@@ -0,0 +1,20 @@
+//KT-2216 Nullability of a value determined in function parameter computation doesn't pass to code following
+package kt2216
+
+fun bar(y: Int, z: Int) = y + z
+fun baz(a: Int, b: Int, c: Int, d: Int) = a + b + c + d
+
+fun foo() {
+    val x: Int? = 0
+    
+    bar(if (x != null) x else return, x)
+    x + 2
+    bar(x, x<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>)
+    
+    val y: Int? = 0
+    val z: Int? = 0
+    bar(if (y != null) y else <!TYPE_MISMATCH!>z<!>, <!TYPE_MISMATCH!>y<!>)
+    y <!UNSAFE_INFIX_CALL!>+<!> 2
+    baz(<!TYPE_MISMATCH!>y<!>, <!TYPE_MISMATCH!>y<!>, if (y == null) return else y, y)
+    baz(y, z!!, z, y)
+}