diff --git a/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/defaultUpperBound.kt b/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/defaultUpperBound.kt
index 42a8b3ee6e8..9a4338ec29b 100644
--- a/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/defaultUpperBound.kt
+++ b/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/defaultUpperBound.kt
@@ -17,13 +17,13 @@ fun box(): String {
     val type = test<Any>()
     val x = type.arguments.single().type!!.classifier as KTypeParameter
 
-    val expected = className("kotlin", "Any?")
+    val expected = className("kotlin.Any?")
     assertEquals(expected, x.upperBounds.joinToString())
 
     return "OK"
 }
 
-fun className(qualifier: String, name: String): String {
+fun className(fqName: String): String {
     val isJS = 1 as Any is Double
-    return if (isJS) name else "$qualifier.$name"
+    return if (isJS) fqName.substringAfterLast('.') else fqName
 }
diff --git a/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/simpleClassParameter.kt b/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/simpleClassParameter.kt
index d535a38f1db..1ca557ee420 100644
--- a/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/simpleClassParameter.kt
+++ b/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/simpleClassParameter.kt
@@ -16,13 +16,13 @@ class C<X> {
 }
 
 fun box(): String {
-    val fqn = className("test", "Container")
+    val fqn = className("test.Container")
     assertEquals("$fqn<X>", C<Any>().notNull().toString())
     assertEquals("$fqn<X?>", C<Any>().nullable().toString())
     return "OK"
 }
 
-fun className(qualifier: String, name: String): String {
+fun className(fqName: String): String {
     val isJS = 1 as Any is Double
-    return if (isJS) name else "$qualifier.$name"
+    return if (isJS) fqName.substringAfterLast('.') else fqName
 }
diff --git a/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/simpleFunctionParameter.kt b/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/simpleFunctionParameter.kt
index b55d1dc1125..865bc1fcd3a 100644
--- a/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/simpleFunctionParameter.kt
+++ b/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/simpleFunctionParameter.kt
@@ -14,13 +14,13 @@ fun <X1> notNull() = typeOf<Container<X1>>()
 fun <X2> nullable() = typeOf<Container<X2?>>()
 
 fun box(): String {
-    val fqn = className("test", "Container")
+    val fqn = className("test.Container")
     assertEquals("$fqn<X1>", notNull<Any>().toString())
     assertEquals("$fqn<X2?>", nullable<Any>().toString())
     return "OK"
 }
 
-fun className(qualifier: String, name: String): String {
+fun className(fqName: String): String {
     val isJS = 1 as Any is Double
-    return if (isJS) name else "$qualifier.$name"
+    return if (isJS) fqName.substringAfterLast('.') else fqName
 }
diff --git a/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/simplePropertyParameter.kt b/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/simplePropertyParameter.kt
index 453372356d1..420cd95711b 100644
--- a/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/simplePropertyParameter.kt
+++ b/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/simplePropertyParameter.kt
@@ -14,13 +14,13 @@ val <X1> X1.notNull get() = typeOf<Container<X1>>()
 val <X2> X2.nullable get() = typeOf<Container<X2?>>()
 
 fun box(): String {
-    val fqn = className("test", "Container")
+    val fqn = className("test.Container")
     assertEquals("$fqn<X1>", "".notNull.toString())
     assertEquals("$fqn<X2?>", "".nullable.toString())
     return "OK"
 }
 
-fun className(qualifier: String, name: String): String {
+fun className(fqName: String): String {
     val isJS = 1 as Any is Double
-    return if (isJS) name else "$qualifier.$name"
+    return if (isJS) fqName.substringAfterLast('.') else fqName
 }
diff --git a/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/upperBounds.kt b/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/upperBounds.kt
index d5e75a2e458..f08a3eaa0d1 100644
--- a/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/upperBounds.kt
+++ b/compiler/testData/codegen/box/reflection/typeOf/nonReifiedTypeParameters/upperBounds.kt
@@ -16,25 +16,25 @@ fun <X, Y, Z> test() where X : Y?, Y : List<Z>, Z : Set<String>
 
 fun box(): String {
     val type = test<MutableList<Set<String>>?, MutableList<Set<String>>, Set<String>>()
-    val containerNmae = className("test", "Container")
+    val containerNmae = className("test.Container")
     assertEquals("$containerNmae<X>", type.toString())
 
     val x = type.arguments.single().type!!.classifier as KTypeParameter
     assertEquals("Y?", x.upperBounds.joinToString())
 
     val y = x.upperBounds.single().classifier as KTypeParameter
-    val listName = className("kotlin.collections", "List")
+    val listName = className("kotlin.collections.List")
     assertEquals("$listName<Z>", y.upperBounds.joinToString())
 
     val z = y.upperBounds.single().arguments.single().type!!.classifier as KTypeParameter
-    val setName = className("kotlin.collections", "Set")
-    val stringName = className("kotlin", "String")
+    val setName = className("kotlin.collections.Set")
+    val stringName = className("kotlin.String")
     assertEquals("$setName<$stringName>", z.upperBounds.joinToString())
 
     return "OK"
 }
 
-fun className(qualifier: String, name: String): String {
+fun className(fqName: String): String {
     val isJS = 1 as Any is Double
-    return if (isJS) name else "$qualifier.$name"
+    return if (isJS) fqName.substringAfterLast('.') else fqName
 }