diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java
index 086e74c9c2b..da142b3cb34 100644
--- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java
+++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java
@@ -90,6 +90,7 @@ public class SpecialFiles {
 
         excludedFiles.add("nestedClasses.kt"); // additional nested class in 'Thread' class on Android
         excludedFiles.add("kt12200Const.kt"); // no 'modifiers' field in 'java.lang.reflect.Field' class
+        excludedFiles.add("testImmutableRemove.kt"); // need to compile against java 6
 
         excludedFiles.add("closureOfInnerLocalClass.kt"); // KT-8120
         excludedFiles.add("closureWithSelfInstantiation.kt"); // KT-8120
diff --git a/compiler/testData/codegen/boxInline/property/reifiedVal.kt b/compiler/testData/codegen/boxInline/property/reifiedVal.kt
index 42a045ec916..52b0a4182e0 100644
--- a/compiler/testData/codegen/boxInline/property/reifiedVal.kt
+++ b/compiler/testData/codegen/boxInline/property/reifiedVal.kt
@@ -3,7 +3,7 @@
 package test
 
 inline val <reified T: Any> T.value: String
-    get() = T::class.java.name
+    get() = T::class.java.simpleName
 
 // FILE: 2.kt
 import test.*
diff --git a/compiler/testData/codegen/boxInline/property/reifiedVar.kt b/compiler/testData/codegen/boxInline/property/reifiedVar.kt
index ca7b8731d0e..814a03fbbcb 100644
--- a/compiler/testData/codegen/boxInline/property/reifiedVar.kt
+++ b/compiler/testData/codegen/boxInline/property/reifiedVar.kt
@@ -5,7 +5,7 @@ package test
 var bvalue: String = ""
 
 inline var <reified T : Any> T.value: String
-    get() = T::class.java.name + bvalue
+    get() = T::class.java.simpleName + bvalue
     set(p: String) {
         bvalue = p
     }