diff --git a/compiler/testData/codegen/box/classes/kt1535.kt b/compiler/testData/codegen/box/classes/kt1535.kt
index b50e44824f7..479c65122e6 100644
--- a/compiler/testData/codegen/box/classes/kt1535.kt
+++ b/compiler/testData/codegen/box/classes/kt1535.kt
@@ -1,6 +1,6 @@
-class Works() : Function0<Object> {
-    public override fun invoke():Object {
-      return "Works" as Object
+class Works() : Function0<Any> {
+    public override fun invoke():Any {
+      return "Works" as Any
     }
 }
 class Broken() : Function0<String> {
@@ -10,7 +10,7 @@ class Broken() : Function0<String> {
 }
 
 fun box(): String {
-  val works1: ()->Object = Works();
+  val works1: ()->Any = Works();
   works1()
 
   val broken1: ()->String = Broken();
diff --git a/compiler/testData/codegen/box/functions/defaultargs.kt b/compiler/testData/codegen/box/functions/defaultargs.kt
index 00029f6a156..726a4d4db10 100644
--- a/compiler/testData/codegen/box/functions/defaultargs.kt
+++ b/compiler/testData/codegen/box/functions/defaultargs.kt
@@ -1,4 +1,4 @@
-open abstract class B() : java.lang.Object() {
+open abstract class B {
     fun foo(arg: Int = 239 + 1) : Int = arg
 }
 
diff --git a/compiler/testData/codegen/box/functions/defaultargs1.kt b/compiler/testData/codegen/box/functions/defaultargs1.kt
index 54fa86ad1c0..5666dd5603d 100644
--- a/compiler/testData/codegen/box/functions/defaultargs1.kt
+++ b/compiler/testData/codegen/box/functions/defaultargs1.kt
@@ -1,4 +1,4 @@
-fun <T> T.toPrefixedString(prefix: String = "", suffix: String="") = prefix + (this as java.lang.Object).toString() + suffix
+fun <T> T.toPrefixedString(prefix: String = "", suffix: String="") = prefix + this.toString() + suffix
 
 fun box() : String {
     if("mama".toPrefixedString(suffix="321", prefix="papa") != "papamama321") return "fail"
diff --git a/compiler/testData/codegen/box/functions/defaultargs4.kt b/compiler/testData/codegen/box/functions/defaultargs4.kt
index 0ca787e85b6..045f17be11f 100644
--- a/compiler/testData/codegen/box/functions/defaultargs4.kt
+++ b/compiler/testData/codegen/box/functions/defaultargs4.kt
@@ -4,12 +4,11 @@ trait A {
     fun bar(arg: Int = 240) : Int = bar2(arg/2)
 }
 
-open abstract class B() : A, java.lang.Object() {
+open abstract class B : A {
     override fun bar2(arg: Int) : Int = arg
 }
 
-class C() : B() {
-}
+class C : B()
 
 fun box() : String {
     if(C().bar(10) != 5) return "fail"
diff --git a/compiler/testData/codegen/box/functions/defaultargs5.kt b/compiler/testData/codegen/box/functions/defaultargs5.kt
index fa64285d75d..91dc6f6be40 100644
--- a/compiler/testData/codegen/box/functions/defaultargs5.kt
+++ b/compiler/testData/codegen/box/functions/defaultargs5.kt
@@ -1,8 +1,8 @@
-open abstract class B() : java.lang.Object() {
+open abstract class B {
     abstract fun foo2(arg: Int = 239) : Int
 }
 
-class C() : B() {
+class C : B() {
     override fun foo2(arg: Int) : Int = arg
 }
 
diff --git a/compiler/testData/codegen/box/objects/objectLiteral.kt b/compiler/testData/codegen/box/objects/objectLiteral.kt
index 3da8faef734..e6030a1ccd9 100644
--- a/compiler/testData/codegen/box/objects/objectLiteral.kt
+++ b/compiler/testData/codegen/box/objects/objectLiteral.kt
@@ -1,18 +1,18 @@
-class C(x: Int, val y : Int) {
-  fun initChild(x0: Int) : java.lang.Object {
-    var x = x0
-    return object : java.lang.Object() {
-      override fun toString(): String {
-          x = x + y
-          return "child" + x
-      }
+class C(x: Int, val y: Int) {
+    fun initChild(x0: Int): Any {
+        var x = x0
+        return object {
+            override fun toString(): String {
+                x = x + y
+                return "child" + x
+            }
+        }
     }
-  }
 
-  val child = initChild(x)
+    val child = initChild(x)
 }
 
 fun box(): String {
-  val c = C(10,3)
-  return if (c.child.toString() == "child13" && c.child.toString() == "child16" && c.child.toString() == "child19") "OK" else "fail"
+    val c = C(10, 3)
+    return if (c.child.toString() == "child13" && c.child.toString() == "child16" && c.child.toString() == "child19") "OK" else "fail"
 }
diff --git a/compiler/testData/codegen/box/objects/objectLiteralInClosure.kt b/compiler/testData/codegen/box/objects/objectLiteralInClosure.kt
index d63c1c879fa..34ea54ddebf 100644
--- a/compiler/testData/codegen/box/objects/objectLiteralInClosure.kt
+++ b/compiler/testData/codegen/box/objects/objectLiteralInClosure.kt
@@ -1,17 +1,17 @@
 package p
 
-class C(val y : Int) {
-  val initChild = { ->
-    object : java.lang.Object() {
-      override fun toString(): String {
-          return "child" + y
-      }
+class C(val y: Int) {
+    val initChild = { ->
+        object {
+            override fun toString(): String {
+                return "child" + y
+            }
+        }
     }
-  }
 }
 
 fun box(): String {
-  val c = C(3).initChild
-  val x = c().toString()
-  return if(x == "child3") "OK" else x
+    val c = C(3).initChild
+    val x = c().toString()
+    return if (x == "child3") "OK" else x
 }