diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/KotlinJsr223JvmInvocableScriptEngine.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/KotlinJsr223JvmInvocableScriptEngine.kt
index 727e47ce520..b5d8ddeaa6e 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/KotlinJsr223JvmInvocableScriptEngine.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/KotlinJsr223JvmInvocableScriptEngine.kt
@@ -35,7 +35,7 @@ interface KotlinJsr223JvmInvocableScriptEngine : Invocable {
         val evalState = state.asState(GenericReplEvaluatorState::class.java)
         return evalState.history.map { it.item }.filter { it.instance != null }.reversed().ensureNotEmpty("no script ").let { history ->
             if (receiverInstance != null) {
-                val receiverKlass = receiverClass ?: receiverInstance::class.java.kotlin
+                val receiverKlass = receiverClass ?: receiverInstance::class
                 val receiverInHistory = history.find { it.instance == receiverInstance } ?:
                                         EvalClassWithInstanceAndLoader(receiverKlass, receiverInstance, receiverKlass.java.classLoader, history.first().invokeWrapper)
                 listOf(receiverInHistory) + history.filterNot { it == receiverInHistory }
@@ -54,7 +54,7 @@ interface KotlinJsr223JvmInvocableScriptEngine : Invocable {
     override fun invokeMethod(thiz: Any?, name: String?, vararg args: Any?): Any? {
         if (name == null) throw java.lang.NullPointerException("method name cannot be null")
         if (thiz == null) throw IllegalArgumentException("cannot invoke method on the null object")
-        return invokeImpl(prioritizedHistory(thiz::class.java.kotlin, thiz), name, args)
+        return invokeImpl(prioritizedHistory(thiz::class, thiz), name, args)
     }
 
     private fun invokeImpl(prioritizedCallOrder: List<EvalClassWithInstanceAndLoader>, name: String, args: Array<out Any?>): Any? {
diff --git a/compiler/testData/codegen/box/reflection/methodsFromAny/memberExtensionToString.kt b/compiler/testData/codegen/box/reflection/methodsFromAny/memberExtensionToString.kt
index 1fe66891efa..5bd812cc1d6 100644
--- a/compiler/testData/codegen/box/reflection/methodsFromAny/memberExtensionToString.kt
+++ b/compiler/testData/codegen/box/reflection/methodsFromAny/memberExtensionToString.kt
@@ -14,10 +14,10 @@ class A {
 }
 
 fun box(): String {
-    val p = A::class.java.kotlin.memberExtensionProperties.single()
+    val p = A::class.memberExtensionProperties.single()
     return if ("$p" == "var A.(kotlin.String.)id: kotlin.String") "OK" else "Fail $p"
 
-    val q = A::class.java.kotlin.declaredFunctions.single()
+    val q = A::class.declaredFunctions.single()
     if ("$q" != "fun A.(kotlin.Int.)foo(): kotlin.Double") return "Fail q $q"
 
     return "OK"
diff --git a/compiler/testData/codegen/box/reflection/properties/callPrivatePropertyFromGetProperties.kt b/compiler/testData/codegen/box/reflection/properties/callPrivatePropertyFromGetProperties.kt
index 0006b5c4efe..82f1f880475 100644
--- a/compiler/testData/codegen/box/reflection/properties/callPrivatePropertyFromGetProperties.kt
+++ b/compiler/testData/codegen/box/reflection/properties/callPrivatePropertyFromGetProperties.kt
@@ -9,7 +9,7 @@ import kotlin.reflect.jvm.*
 class K(private val value: String)
 
 fun box(): String {
-    val p = K::class.java.kotlin.memberProperties.single() as KProperty1<K, String>
+    val p = K::class.memberProperties.single() as KProperty1<K, String>
 
     try {
         return p.get(K("Fail: private property should not be accessible by default"))
diff --git a/compiler/testData/codegen/box/reflection/properties/fakeOverridesInSubclass.kt b/compiler/testData/codegen/box/reflection/properties/fakeOverridesInSubclass.kt
index abeae583ff4..c1103bb6411 100644
--- a/compiler/testData/codegen/box/reflection/properties/fakeOverridesInSubclass.kt
+++ b/compiler/testData/codegen/box/reflection/properties/fakeOverridesInSubclass.kt
@@ -11,10 +11,10 @@ open class Super(val r: String)
 class Sub(r: String) : Super(r)
 
 fun box(): String {
-    val props = Sub::class.java.kotlin.declaredMemberProperties
+    val props = Sub::class.declaredMemberProperties
     if (!props.isEmpty()) return "Fail $props"
 
-    val allProps = Sub::class.java.kotlin.memberProperties
+    val allProps = Sub::class.memberProperties
     assertEquals(listOf("r"), allProps.map { it.name })
     return allProps.single().get(Sub("OK")) as String
 }
diff --git a/compiler/testData/codegen/box/reflection/properties/getExtensionPropertiesMutableVsReadonly.kt b/compiler/testData/codegen/box/reflection/properties/getExtensionPropertiesMutableVsReadonly.kt
index 13b0c3fbec9..5864544cef6 100644
--- a/compiler/testData/codegen/box/reflection/properties/getExtensionPropertiesMutableVsReadonly.kt
+++ b/compiler/testData/codegen/box/reflection/properties/getExtensionPropertiesMutableVsReadonly.kt
@@ -17,7 +17,7 @@ class A {
 }
 
 fun box(): String {
-    val props = A::class.java.kotlin.memberExtensionProperties
+    val props = A::class.memberExtensionProperties
     val readonly = props.single { it.name == "readonly" }
     assert(readonly !is KMutableProperty2<A, *, *>) { "Fail 1: $readonly" }
     val mutable = props.single { it.name == "mutable" }
diff --git a/compiler/testData/codegen/box/reflection/properties/getPropertiesMutableVsReadonly.kt b/compiler/testData/codegen/box/reflection/properties/getPropertiesMutableVsReadonly.kt
index 736d0a33b91..ef0f2b85ad6 100644
--- a/compiler/testData/codegen/box/reflection/properties/getPropertiesMutableVsReadonly.kt
+++ b/compiler/testData/codegen/box/reflection/properties/getPropertiesMutableVsReadonly.kt
@@ -10,7 +10,7 @@ class A(val readonly: String) {
 }
 
 fun box(): String {
-    val props = A::class.java.kotlin.memberProperties
+    val props = A::class.memberProperties
     val readonly = props.single { it.name == "readonly" }
     assert(readonly !is KMutableProperty1<A, *>) { "Fail 1: $readonly" }
     val mutable = props.single { it.name == "mutable" }
diff --git a/compiler/testData/codegen/box/reflection/properties/kotlinPropertyInheritedInJava.kt b/compiler/testData/codegen/box/reflection/properties/kotlinPropertyInheritedInJava.kt
index 20166493f5a..0d0f7c6f23d 100644
--- a/compiler/testData/codegen/box/reflection/properties/kotlinPropertyInheritedInJava.kt
+++ b/compiler/testData/codegen/box/reflection/properties/kotlinPropertyInheritedInJava.kt
@@ -32,7 +32,7 @@ fun box(): String {
     if (prop == K::prop) return "Fail J::prop == K::prop (these are different properties)"
 
 
-    val klass = J::class.java.kotlin
+    val klass = J::class
     if (klass.declaredMemberProperties.isNotEmpty()) return "Fail: declaredMemberProperties should be empty"
     if (klass.declaredMemberExtensionProperties.isNotEmpty()) return "Fail: declaredMemberExtensionProperties should be empty"
 
diff --git a/compiler/testData/codegen/box/reflection/properties/memberAndMemberExtensionWithSameName.kt b/compiler/testData/codegen/box/reflection/properties/memberAndMemberExtensionWithSameName.kt
index 1078c0380f9..b7dab8ddb0e 100644
--- a/compiler/testData/codegen/box/reflection/properties/memberAndMemberExtensionWithSameName.kt
+++ b/compiler/testData/codegen/box/reflection/properties/memberAndMemberExtensionWithSameName.kt
@@ -12,13 +12,13 @@ class A {
 
 fun box(): String {
     run {
-        val foo: KProperty1<A, *> = A::class.java.kotlin.memberProperties.single()
+        val foo: KProperty1<A, *> = A::class.memberProperties.single()
         assert(foo.name == "foo") { "Fail name: $foo (${foo.name})" }
         assert(foo.get(A()) == "member") { "Fail value: ${foo.get(A())}" }
     }
 
     run {
-        val foo: KProperty2<A, *, *> = A::class.java.kotlin.memberExtensionProperties.single()
+        val foo: KProperty2<A, *, *> = A::class.memberExtensionProperties.single()
         assert(foo.name == "foo") { "Fail name: $foo (${foo.name})" }
         foo as KProperty2<A, Unit, *>
         assert(foo.get(A(), Unit) == "extension") { "Fail value: ${foo.get(A(), Unit)}" }
diff --git a/compiler/testData/codegen/box/reflection/properties/simpleGetProperties.kt b/compiler/testData/codegen/box/reflection/properties/simpleGetProperties.kt
index f14387359b6..c33f7a385ce 100644
--- a/compiler/testData/codegen/box/reflection/properties/simpleGetProperties.kt
+++ b/compiler/testData/codegen/box/reflection/properties/simpleGetProperties.kt
@@ -16,9 +16,7 @@ class A(param: String) {
 }
 
 fun box(): String {
-    val klass = A::class.java.kotlin
-
-    val props = klass.memberProperties
+    val props = A::class.memberProperties
 
     val names = props.map { it.name }.sorted()
     assert(names == listOf("anyVar", "int", "string")) { "Fail names: $props" }