diff --git a/idea/testData/completion/injava/ClassFromNamespace.java b/idea/testData/completion/injava/ClassFromNamespace.java
new file mode 100644
index 00000000000..fc742d146d1
--- /dev/null
+++ b/idea/testData/completion/injava/ClassFromNamespace.java
@@ -0,0 +1,9 @@
+public class Testing {
+    public static void test() {
+        jettesting.some.<caret>
+    }
+}
+
+// EXIST: ClassFromJet
+// EXIST: namespace
+// NUMBER: 2
\ No newline at end of file
diff --git a/idea/testData/completion/injava/ClassFromNamespace.kt b/idea/testData/completion/injava/ClassFromNamespace.kt
new file mode 100644
index 00000000000..9a70e32cfe6
--- /dev/null
+++ b/idea/testData/completion/injava/ClassFromNamespace.kt
@@ -0,0 +1,4 @@
+package jettesting.some
+
+class ClassFromJet {
+}
\ No newline at end of file
diff --git a/idea/testData/completion/injava/JetFunction.java b/idea/testData/completion/injava/JetFunction.java
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/idea/testData/completion/injava/JetFunction.kt b/idea/testData/completion/injava/JetFunction.kt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/idea/testData/completion/injava/TopLevelPackages.java b/idea/testData/completion/injava/TopLevelPackages.java
deleted file mode 100644
index 54b36501e64..00000000000
--- a/idea/testData/completion/injava/TopLevelPackages.java
+++ /dev/null
@@ -1,7 +0,0 @@
-public class Testing {
-    public static void test() {
-        jett<caret>
-    }
-}
-
-// EXIST: jettesting
\ No newline at end of file
diff --git a/idea/testData/completion/injava/TopLevelPackages.kt b/idea/testData/completion/injava/TopLevelPackages.kt
deleted file mode 100644
index c9151e568e3..00000000000
--- a/idea/testData/completion/injava/TopLevelPackages.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package jettesting
-
-class ClassFromJet {
-}
\ No newline at end of file
diff --git a/idea/testData/completion/injava/TraitInJava.java b/idea/testData/completion/injava/TraitInJava.java
new file mode 100644
index 00000000000..60ee7cad2fa
--- /dev/null
+++ b/idea/testData/completion/injava/TraitInJava.java
@@ -0,0 +1,6 @@
+public class Testing implements TraitFr<caret> {
+    public static void test() {
+    }
+}
+
+// EXIST: TraitFromJet
\ No newline at end of file
diff --git a/idea/testData/completion/injava/TraitInJava.kt b/idea/testData/completion/injava/TraitInJava.kt
new file mode 100644
index 00000000000..11716db1dce
--- /dev/null
+++ b/idea/testData/completion/injava/TraitInJava.kt
@@ -0,0 +1,4 @@
+package jettesting.traits
+
+trait TraitFromJet {
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/completion/JetCompletionMultiTestBase.java b/idea/tests/org/jetbrains/jet/completion/JetCompletionMultiTestBase.java
index 946477c3ddc..7757bd39d9f 100644
--- a/idea/tests/org/jetbrains/jet/completion/JetCompletionMultiTestBase.java
+++ b/idea/tests/org/jetbrains/jet/completion/JetCompletionMultiTestBase.java
@@ -17,23 +17,27 @@ public abstract class JetCompletionMultiTestBase extends CompletionTestCase {
      * @param completionLevel {@see CompletionParameters.getInvocationCount()} javadoc
      * @throws Exception
      */
-    protected void doFileTest(int completionLevel) throws Exception {
-        configureByFiles(null, getFileNameList());
-        complete(completionLevel);
+    protected void doFileTest(int completionLevel) {
+        try {
+            configureByFiles(null, getFileNameList());
+            complete(completionLevel);
 
-        final String fileText = getFile().getText();
-        final ExpectedCompletionUtils completionUtils = new ExpectedCompletionUtils();
+            final String fileText = getFile().getText();
+            final ExpectedCompletionUtils completionUtils = new ExpectedCompletionUtils();
 
-        assertContainsItems(completionUtils.itemsShouldExist(fileText));
-        assertNotContainItems(completionUtils.itemsShouldAbsent(fileText));
+            assertContainsItems(completionUtils.itemsShouldExist(fileText));
+            assertNotContainItems(completionUtils.itemsShouldAbsent(fileText));
 
-        Integer itemsNumber = completionUtils.getExpectedNumber(fileText);
-        if (itemsNumber != null) {
-            assertEquals(itemsNumber.intValue(), myItems.length);
+            Integer itemsNumber = completionUtils.getExpectedNumber(fileText);
+            if (itemsNumber != null) {
+                assertEquals(itemsNumber.intValue(), myItems.length);
+            }
+        } catch (Exception e) {
+            throw new AssertionError(e);
         }
     }
 
-    protected void doFileTest() throws Exception {
+    protected void doFileTest() {
         doFileTest(1);
     }
 
diff --git a/idea/tests/org/jetbrains/jet/completion/JetInJavaCompletionTest.java b/idea/tests/org/jetbrains/jet/completion/JetInJavaCompletionTest.java
index ca4a00e387d..42d428c3c6a 100644
--- a/idea/tests/org/jetbrains/jet/completion/JetInJavaCompletionTest.java
+++ b/idea/tests/org/jetbrains/jet/completion/JetInJavaCompletionTest.java
@@ -7,16 +7,23 @@ import org.jetbrains.jet.plugin.PluginTestCaseBase;
  */
 public class JetInJavaCompletionTest extends JetCompletionMultiTestBase {
 
-    public void testJetClassInJava() throws Exception {
+    public void testJetClassInJava() {
         doFileTest();
     }
 
-    public void testJetSubpackage() throws Exception {
+    public void testJetSubpackage() {
         doFileTest();
     }
 
-    // TODO: fix and uncomment
-    public void skiptestTopLevelPackages() throws Exception {
+    public void testClassFromNamespace() {
+        doFileTest();
+    }
+
+    public void testJetFunction() {
+        doFileTest();
+    }
+
+    public void testTraitInJava() {
         doFileTest();
     }