diff --git a/idea/testData/completion/basic/common/InFunctionArguments.kt b/idea/testData/completion/basic/common/InFunctionArguments.kt
new file mode 100644
index 00000000000..701ea139e02
--- /dev/null
+++ b/idea/testData/completion/basic/common/InFunctionArguments.kt
@@ -0,0 +1,14 @@
+class Foo {
+    fun add(a: Any) {}
+}
+
+
+fun test() {
+    val foo = Foo()
+    foo.add(AL<caret>)
+}
+
+/* For KT-3779, KT-2821 */
+
+// INVOCATION_COUNT: 2
+// EXIST: ArrayList
diff --git a/idea/testData/completion/basic/multifile/NotImportedJavaClass.kt b/idea/testData/completion/basic/multifile/NotImportedJavaClass.kt
new file mode 100644
index 00000000000..507aff8cbc3
--- /dev/null
+++ b/idea/testData/completion/basic/multifile/NotImportedJavaClass.kt
@@ -0,0 +1,10 @@
+package some
+
+fun foo(i: Int) = 1
+fun test() {
+    foo(B<caret>)
+}
+
+/* KT-3779, KT-2821 */
+
+// EXIST: Bar
\ No newline at end of file
diff --git a/idea/testData/completion/basic/multifile/javapackage/Bar.java b/idea/testData/completion/basic/multifile/javapackage/Bar.java
new file mode 100644
index 00000000000..297987841d5
--- /dev/null
+++ b/idea/testData/completion/basic/multifile/javapackage/Bar.java
@@ -0,0 +1,6 @@
+package javapackage;
+
+// For NotImportedJavaClass.kt
+public class Bar {
+    public static int BAZZ = 1;
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java
index c672a3bd746..d13c5515a55 100644
--- a/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java
@@ -234,6 +234,11 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
             doTest("idea/testData/completion/basic/common/InFunInClassInitializer.kt");
         }
         
+        @TestMetadata("InFunctionArguments.kt")
+        public void testInFunctionArguments() throws Exception {
+            doTest("idea/testData/completion/basic/common/InFunctionArguments.kt");
+        }
+        
         @TestMetadata("InGlobalPropertyInitializer.kt")
         public void testInGlobalPropertyInitializer() throws Exception {
             doTest("idea/testData/completion/basic/common/InGlobalPropertyInitializer.kt");
diff --git a/idea/tests/org/jetbrains/jet/completion/JetMultifileBasicCompletionTest.java b/idea/tests/org/jetbrains/jet/completion/JetMultifileBasicCompletionTest.java
index 07b27813b8a..511e56b8215 100644
--- a/idea/tests/org/jetbrains/jet/completion/JetMultifileBasicCompletionTest.java
+++ b/idea/tests/org/jetbrains/jet/completion/JetMultifileBasicCompletionTest.java
@@ -51,6 +51,11 @@ public class JetMultifileBasicCompletionTest extends JetCompletionMultiTestBase
         doFileTest();
     }
 
+    public void testNotImportedJavaClass() throws Exception {
+        String fileName = getTestName(false);
+        doFileTest(2, new String[] {fileName + ".kt", "javapackage/Bar.java"});
+    }
+
     public void testInImportedFunctionLiteralParameter() throws Exception {
         doFileTest(2);
     }
diff --git a/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java
index a320890964a..2e7ed81e234 100644
--- a/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java
@@ -234,6 +234,11 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
             doTest("idea/testData/completion/basic/common/InFunInClassInitializer.kt");
         }
         
+        @TestMetadata("InFunctionArguments.kt")
+        public void testInFunctionArguments() throws Exception {
+            doTest("idea/testData/completion/basic/common/InFunctionArguments.kt");
+        }
+        
         @TestMetadata("InGlobalPropertyInitializer.kt")
         public void testInGlobalPropertyInitializer() throws Exception {
             doTest("idea/testData/completion/basic/common/InGlobalPropertyInitializer.kt");