diff --git a/idea/idea-completion/testData/handlers/ClassCompletionBeforeName.kt b/idea/idea-completion/testData/handlers/ClassCompletionBeforeName.kt
index 35fdcadade3..78d4bbbb1c2 100644
--- a/idea/idea-completion/testData/handlers/ClassCompletionBeforeName.kt
+++ b/idea/idea-completion/testData/handlers/ClassCompletionBeforeName.kt
@@ -1,2 +1,3 @@
+// RUNTIME
 fun Str<caret>foo() {
 }
\ No newline at end of file
diff --git a/idea/idea-completion/testData/handlers/ClassCompletionBeforeName.kt.after b/idea/idea-completion/testData/handlers/ClassCompletionBeforeName.kt.after
index c6b8d0d45cd..20d1d1c7dcb 100644
--- a/idea/idea-completion/testData/handlers/ClassCompletionBeforeName.kt.after
+++ b/idea/idea-completion/testData/handlers/ClassCompletionBeforeName.kt.after
@@ -1,2 +1,3 @@
+// RUNTIME
 fun StringBuilder<caret>foo() {
 }
\ No newline at end of file
diff --git a/idea/idea-completion/testData/handlers/ParameterType.kt b/idea/idea-completion/testData/handlers/ParameterType.kt
index dba6e330fbc..288f96898e2 100644
--- a/idea/idea-completion/testData/handlers/ParameterType.kt
+++ b/idea/idea-completion/testData/handlers/ParameterType.kt
@@ -1,2 +1,3 @@
+// RUNTIME
 fun foo(p: StringB<caret>) {
 }
\ No newline at end of file
diff --git a/idea/idea-completion/testData/handlers/ParameterType.kt.after b/idea/idea-completion/testData/handlers/ParameterType.kt.after
index 274e694f6b6..4471d8006bd 100644
--- a/idea/idea-completion/testData/handlers/ParameterType.kt.after
+++ b/idea/idea-completion/testData/handlers/ParameterType.kt.after
@@ -1,2 +1,3 @@
+// RUNTIME
 fun foo(p: StringBuilder<caret>) {
 }
\ No newline at end of file
diff --git a/idea/idea-completion/testData/handlers/basic/FirstTypeArgument.kt b/idea/idea-completion/testData/handlers/basic/FirstTypeArgument.kt
index 4bcde02b862..771d2c1e927 100644
--- a/idea/idea-completion/testData/handlers/basic/FirstTypeArgument.kt
+++ b/idea/idea-completion/testData/handlers/basic/FirstTypeArgument.kt
@@ -2,4 +2,5 @@ class Foo<T, V>
 
 class Bar: Foo<S<caret>
 
-// ELEMENT: StringBuilder
\ No newline at end of file
+// ELEMENT: StringBuilder
+// TAIL_TEXT: " (kotlin.text)"
\ No newline at end of file
diff --git a/idea/idea-completion/testData/handlers/basic/FirstTypeArgument.kt.after b/idea/idea-completion/testData/handlers/basic/FirstTypeArgument.kt.after
index 8158e77a1f4..5a993c3953f 100644
--- a/idea/idea-completion/testData/handlers/basic/FirstTypeArgument.kt.after
+++ b/idea/idea-completion/testData/handlers/basic/FirstTypeArgument.kt.after
@@ -1,5 +1,6 @@
 class Foo<T, V>
 
-class Bar: Foo<StringBuilder<caret>
+class Bar: Foo<StringBuilder
 
-// ELEMENT: StringBuilder
\ No newline at end of file
+// ELEMENT: StringBuilder
+// TAIL_TEXT: " (kotlin.text)"
\ No newline at end of file
diff --git a/idea/idea-completion/testData/handlers/basic/SecondTypeArg.kt b/idea/idea-completion/testData/handlers/basic/SecondTypeArg.kt
index 7f0d77b79e8..7beda150e62 100644
--- a/idea/idea-completion/testData/handlers/basic/SecondTypeArg.kt
+++ b/idea/idea-completion/testData/handlers/basic/SecondTypeArg.kt
@@ -1,7 +1,6 @@
-import java.util.HashMap
-
 fun foo() {
     val v = HashMap<String, H<caret>
 }
 
-// ELEMENT: HashSet
\ No newline at end of file
+// ELEMENT: HashSet
+// TAIL_TEXT: "<E> (kotlin.collections)"
\ No newline at end of file
diff --git a/idea/idea-completion/testData/handlers/basic/SecondTypeArg.kt.after b/idea/idea-completion/testData/handlers/basic/SecondTypeArg.kt.after
index a77f40ce2a7..9a43c1747c0 100644
--- a/idea/idea-completion/testData/handlers/basic/SecondTypeArg.kt.after
+++ b/idea/idea-completion/testData/handlers/basic/SecondTypeArg.kt.after
@@ -1,8 +1,6 @@
-import java.util.HashMap
-import java.util.HashSet
-
 fun foo() {
-    val v = HashMap<String, HashSet<caret>
+    val v = HashMap<String, HashSet
 }
 
-// ELEMENT: HashSet
\ No newline at end of file
+// ELEMENT: HashSet
+// TAIL_TEXT: "<E> (kotlin.collections)"
\ No newline at end of file
diff --git a/idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport.kt b/idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport.kt
index c8324135287..889aa8be138 100644
--- a/idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport.kt
+++ b/idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport.kt
@@ -1,9 +1,9 @@
 class X<T> {
-    fun foo(p: java.util.HashMap<java.io.File, T>){}
+    fun foo(p: java.util.TreeMap<java.io.File, T>){}
 
     fun f(){
         foo(<caret>)
     }
 }
 
-// ELEMENT: HashMap
+// ELEMENT: TreeMap
diff --git a/idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport.kt.after b/idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport.kt.after
index 2afd1b064de..86640c0e837 100644
--- a/idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport.kt.after
+++ b/idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport.kt.after
@@ -1,11 +1,11 @@
-import java.util.HashMap
+import java.util.TreeMap
 
 class X<T> {
-    fun foo(p: java.util.HashMap<java.io.File, T>){}
+    fun foo(p: java.util.TreeMap<java.io.File, T>){}
 
     fun f(){
-        foo(HashMap(<caret>))
+        foo(TreeMap())
     }
 }
 
-// ELEMENT: HashMap
+// ELEMENT: TreeMap
diff --git a/idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport2.kt b/idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport2.kt
index edd96819be3..c22d3198df5 100644
--- a/idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport2.kt
+++ b/idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport2.kt
@@ -1,9 +1,9 @@
 class X<T> {
-    fun foo(p: java.util.HashMap<T, java.util.AbstractMap<T, java.io.File>>){}
+    fun foo(p: java.util.TreeMap<T, java.util.AbstractMap<T, java.io.File>>){}
 
     fun f(){
         foo(<caret>)
     }
 }
 
-// ELEMENT: HashMap
+// ELEMENT: TreeMap
diff --git a/idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport2.kt.after b/idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport2.kt.after
index 2550cbe96fe..71f395dc7d3 100644
--- a/idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport2.kt.after
+++ b/idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport2.kt.after
@@ -1,11 +1,11 @@
-import java.util.HashMap
+import java.util.TreeMap
 
 class X<T> {
-    fun foo(p: java.util.HashMap<T, java.util.AbstractMap<T, java.io.File>>){}
+    fun foo(p: java.util.TreeMap<T, java.util.AbstractMap<T, java.io.File>>){}
 
     fun f(){
-        foo(HashMap(<caret>))
+        foo(TreeMap())
     }
 }
 
-// ELEMENT: HashMap
+// ELEMENT: TreeMap
diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTest.kt
index d9218c08c9c..d7b1fb43fab 100644
--- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTest.kt
+++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTest.kt
@@ -49,7 +49,7 @@ import java.io.File
 
     fun testClassCompletionInLambda() = doTest(1, "String", " (kotlin)", '\n')
 
-    fun testClassCompletionBeforeName() = doTest(1, "StringBuilder", " (java.lang)", '\n')
+    fun testClassCompletionBeforeName() = doTest(1, "StringBuilder", " (kotlin.text)", '\n')
 
     fun testDoNotInsertImportForAlreadyImported() = doTest()
 
@@ -129,7 +129,7 @@ import java.io.File
     fun testClassFromClassObject() = doTest(1, "Some", null, '\n')
     fun testClassFromClassObjectInPackage() = doTest(1, "Some", null, '\n')
 
-    fun testParameterType() = doTest(1, "StringBuilder", " (java.lang)", '\n')
+    fun testParameterType() = doTest(1, "StringBuilder", " (kotlin.text)", '\n')
 
     fun testLocalClassCompletion() = doTest(1, "LocalClass", null, '\n')
     fun testNestedLocalClassCompletion() = doTest(1, "Nested", null, '\n')