diff --git a/idea/idea-completion/testData/basic/common/InEmptyImport.kt b/idea/idea-completion/testData/basic/common/InEmptyImport.kt
index 06db9963553..c418140114e 100644
--- a/idea/idea-completion/testData/basic/common/InEmptyImport.kt
+++ b/idea/idea-completion/testData/basic/common/InEmptyImport.kt
@@ -2,7 +2,7 @@ package Test
 
 import <caret>
 
-// EXIST: java
+// EXIST: kotlin
 // EXIST_JAVA_ONLY: javax
 // EXIST_JS_ONLY: jquery
 // ABSENT: Array, Integer
diff --git a/idea/idea-completion/testData/basic/common/InEmptyPackage.kt b/idea/idea-completion/testData/basic/common/InEmptyPackage.kt
index 6699002848f..a354b39f5be 100644
--- a/idea/idea-completion/testData/basic/common/InEmptyPackage.kt
+++ b/idea/idea-completion/testData/basic/common/InEmptyPackage.kt
@@ -1,3 +1,4 @@
 package <caret>
 
-// EXIST: java, kotlin
+// EXIST: kotlin
+// EXIST_JAVA_ONLY: java
diff --git a/idea/idea-completion/testData/basic/common/InMiddleOfPackage.kt b/idea/idea-completion/testData/basic/common/InMiddleOfPackage.kt
index b286aaf5482..26b86184cfe 100644
--- a/idea/idea-completion/testData/basic/common/InMiddleOfPackage.kt
+++ b/idea/idea-completion/testData/basic/common/InMiddleOfPackage.kt
@@ -1,10 +1,10 @@
-package java.ut<caret>il.
+package kotlin.prop<caret>erties.
 
-import java.util.AbstractList
+import kotlin.properties.Delegates
 
 class Test {
 
 }
 
-// EXIST: util
+// EXIST: properties
 // NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/common/StandardJetArrayFirst.kt b/idea/idea-completion/testData/basic/common/StandardJetArrayFirst.kt
index 8e9c62bc250..040c317b569 100644
--- a/idea/idea-completion/testData/basic/common/StandardJetArrayFirst.kt
+++ b/idea/idea-completion/testData/basic/common/StandardJetArrayFirst.kt
@@ -7,9 +7,8 @@ fun main(args: Array<String>) {
 // EXIST: { lookupString:"Array", tailText:"<T> (kotlin)" }
 // EXIST_JAVA_ONLY: { lookupString:"Array", tailText:" (java.sql)" }
 
-// todo: unify following two after introducing collection type aliases
 // EXIST: { lookupString:"ArrayList", tailText:"<E> (kotlin.collections)" }
-// EXIST: { lookupString:"ArrayList", tailText:"<E> (java.util)"}
+// EXIST_JAVA_ONLY: { lookupString:"ArrayList", tailText:"<E> (java.util)"}
 
 
 
diff --git a/idea/idea-completion/testData/basic/common/typeArgsOrNot/ConstructorTypeArg.kt b/idea/idea-completion/testData/basic/common/typeArgsOrNot/ConstructorTypeArg.kt
index f7371bf6e2c..f667b0544c4 100644
--- a/idea/idea-completion/testData/basic/common/typeArgsOrNot/ConstructorTypeArg.kt
+++ b/idea/idea-completion/testData/basic/common/typeArgsOrNot/ConstructorTypeArg.kt
@@ -5,6 +5,6 @@ fun foo() {
 }
 
 // EXIST: String
-// EXIST: java
+// EXIST: kotlin
 // ABSENT: defaultBufferSize
 // ABSENT: readLine
diff --git a/idea/idea-completion/testData/basic/common/typeArgsOrNot/FunctionTypeArg.kt b/idea/idea-completion/testData/basic/common/typeArgsOrNot/FunctionTypeArg.kt
index 765ccd41fd2..64a3f112ddc 100644
--- a/idea/idea-completion/testData/basic/common/typeArgsOrNot/FunctionTypeArg.kt
+++ b/idea/idea-completion/testData/basic/common/typeArgsOrNot/FunctionTypeArg.kt
@@ -3,6 +3,6 @@ fun foo() {
 }
 
 // EXIST: String
-// EXIST: java
+// EXIST: kotlin
 // ABSENT: defaultBufferSize
 // ABSENT: readLine
diff --git a/idea/idea-completion/testData/basic/common/typeArgsOrNot/FunctionTypeArg2.kt b/idea/idea-completion/testData/basic/common/typeArgsOrNot/FunctionTypeArg2.kt
index ca0574ede4a..3e3b26a748f 100644
--- a/idea/idea-completion/testData/basic/common/typeArgsOrNot/FunctionTypeArg2.kt
+++ b/idea/idea-completion/testData/basic/common/typeArgsOrNot/FunctionTypeArg2.kt
@@ -6,6 +6,6 @@ fun foo() {
 }
 
 // EXIST: String
-// EXIST: java
+// EXIST: kotlin
 // ABSENT: defaultBufferSize
 // ABSENT: readLine
diff --git a/idea/idea-completion/testData/basic/common/typeArgsOrNot/LessThan.kt b/idea/idea-completion/testData/basic/common/typeArgsOrNot/LessThan.kt
index c012a7b2455..564e044914b 100644
--- a/idea/idea-completion/testData/basic/common/typeArgsOrNot/LessThan.kt
+++ b/idea/idea-completion/testData/basic/common/typeArgsOrNot/LessThan.kt
@@ -8,6 +8,6 @@ fun foo() {
 }
 
 // EXIST: String
-// EXIST: java
+// EXIST: kotlin
 // EXIST: v
 // EXIST: f
diff --git a/idea/idea-completion/testData/basic/common/typeArgsOrNot/NestedTypeArg.kt b/idea/idea-completion/testData/basic/common/typeArgsOrNot/NestedTypeArg.kt
index 510165f8946..cb1a680a3ab 100644
--- a/idea/idea-completion/testData/basic/common/typeArgsOrNot/NestedTypeArg.kt
+++ b/idea/idea-completion/testData/basic/common/typeArgsOrNot/NestedTypeArg.kt
@@ -1,10 +1,8 @@
-import java.util.HashMap
-
 fun foo() {
     val v = HashMap<List<(s: String?) -> Unit>, Set<<caret>
 }
 
 // EXIST: String
-// EXIST: java
+// EXIST: kotlin
 // ABSENT: defaultBufferSize
 // ABSENT: readLine
diff --git a/idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg.kt b/idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg.kt
index ee0ac6fff87..401e9b15a03 100644
--- a/idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg.kt
+++ b/idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg.kt
@@ -1,8 +1,6 @@
-import java.util.HashMap
-
 fun foo() {
     val v = HashMap<String, <caret>
 }
 
 // EXIST: String
-// EXIST: java
+// EXIST: kotlin
diff --git a/idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg2.kt b/idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg2.kt
index 797cabce27a..0183a9ba74d 100644
--- a/idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg2.kt
+++ b/idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg2.kt
@@ -1,8 +1,6 @@
-import java.util.HashMap
-
 fun foo() {
     val v = HashMap<String, <caret>>
 }
 
 // EXIST: String
-// EXIST: java
+// EXIST: kotlin