diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.kt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.kt
index 36145796a37..84ae8c6d8b5 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.kt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.kt
@@ -1,3 +1,3 @@
 package test
 
-class Clock<A> where A : java.lang.Number, A : java.lang.CharSequence
+class Clock<A> where A : java.lang.Number, A : java.io.Serializable
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.kt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.kt
index 27c8bfdd7cf..16f4f5d2a73 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.kt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.kt
@@ -1,3 +1,3 @@
 package test
 
-class Clock<A : java.lang.CharSequence>
+class Clock<A : java.io.Serializable>
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.kt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.kt
index 67d144ffb45..fa9ed623134 100644
--- a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.kt
+++ b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.kt
@@ -1,3 +1,3 @@
 package test
 
-class Clock<A> where A : java.lang.CharSequence, A : java.lang.Number
+class Clock<A> where A : java.io.Serializable, A : java.lang.Number
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt
index f4d1f4f63d8..f7f7dbdb75c 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt
@@ -1,3 +1,3 @@
 package test
 
-fun <A> tres() where A : java.lang.Number, A : java.lang.CharSequence = 1
+fun <A> tres() where A : java.lang.Number, A : java.io.Serializable = 1
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt
index fc7b646ee05..0848be9d211 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt
@@ -1,3 +1,3 @@
 package test
 
-fun <A : java.lang.CharSequence> dos() = 1
+fun <A : java.io.Serializable> dos() = 1
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt
index d4d7e97c861..74d650134c5 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt
@@ -1,3 +1,3 @@
 package test
 
-fun <A> cuatro() where A : java.lang.CharSequence, A : java.lang.Number = 1
+fun <A> cuatro() where A : java.io.Serializable, A : java.lang.Number = 1
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunParamNullable.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunParamNullable.kt
index 17f91ae6d69..d171dcbbd72 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunParamNullable.kt
+++ b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunParamNullable.kt
@@ -1,3 +1,3 @@
 package test
 
-fun fff(a: java.lang.CharSequence?) = 1
+fun fff(a: java.lang.Integer?) = 1
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunParamNotNull.kt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunParamNotNull.kt
index 30f1bfa56e5..2e95d42a20c 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunParamNotNull.kt
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunParamNotNull.kt
@@ -1,3 +1,3 @@
 package test
 
-fun fff(a: java.lang.CharSequence) = 1
+fun fff(a: java.lang.Integer) = 1
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargCharSequence.kt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargCharSequence.kt
deleted file mode 100644
index 53164ea0f77..00000000000
--- a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargCharSequence.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun varargCharSequence(a: Int, vararg b: java.lang.CharSequence) = 1
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInteger.kt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInteger.kt
new file mode 100644
index 00000000000..3e09babb285
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInteger.kt
@@ -0,0 +1,3 @@
+package test
+
+fun varargCharSequence(a: Int, vararg b: java.lang.Integer) = 1
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNotNull.kt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNotNull.kt
index 136090e8aeb..e385bc6614d 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNotNull.kt
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNotNull.kt
@@ -1,3 +1,3 @@
 package test
 
-fun ff(): java.lang.CharSequence = throw Exception()
+fun ff(): java.lang.Integer = throw Exception()
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNullable.kt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNullable.kt
index 00d102eb9eb..811def8eeca 100644
--- a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNullable.kt
+++ b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNullable.kt
@@ -1,3 +1,3 @@
 package test
 
-fun ff(): java.lang.CharSequence? = null
+fun ff(): java.lang.Integer? = null
diff --git a/compiler/testData/readKotlinBinaryClass/type/ArrayOfCharSequence.kt b/compiler/testData/readKotlinBinaryClass/type/ArrayOfCharSequence.kt
deleted file mode 100644
index 8ba5d0f0661..00000000000
--- a/compiler/testData/readKotlinBinaryClass/type/ArrayOfCharSequence.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun nothing(): Array<java.lang.CharSequence> = throw Exception()
diff --git a/compiler/testData/readKotlinBinaryClass/type/ArrayOfInteger.kt b/compiler/testData/readKotlinBinaryClass/type/ArrayOfInteger.kt
new file mode 100644
index 00000000000..0686929264b
--- /dev/null
+++ b/compiler/testData/readKotlinBinaryClass/type/ArrayOfInteger.kt
@@ -0,0 +1,3 @@
+package test
+
+fun nothing(): Array<java.lang.Integer> = throw Exception()