diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/reifiedTypeClassLiteral.kt b/compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/reifiedTypeClassLiteral.kt
index cfe75eb11a5..637eb88e559 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/reifiedTypeClassLiteral.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/reifiedTypeClassLiteral.kt
@@ -3,13 +3,13 @@ import kotlin.test.*
 class Klass
 class Other
 
-inline fun <reified T> simpleName(): String =
+inline fun <reified T : Any> simpleName(): String =
         T::class.simpleName!!
 
-inline fun <reified T1, reified T2> twoReifiedParams(): String =
+inline fun <reified T1 : Any, reified T2 : Any> twoReifiedParams(): String =
         "${T1::class.simpleName!!}, ${T2::class.simpleName!!}"
 
-inline fun <reified T> myJavaClass(): Class<T> =
+inline fun <reified T : Any> myJavaClass(): Class<T> =
         T::class.java
 
 fun box(): String {
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/constructor.kt b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/constructor.kt
index 59385dd50a2..a8675dd7064 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/mapping/constructor.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/mapping/constructor.kt
@@ -10,7 +10,7 @@ class Secondary {
     constructor(x: Int) {}
 }
 
-fun check(f: KFunction<*>) {
+fun check(f: KFunction<Any>) {
     assert(f.javaMethod == null, "Fail f method")
     assert(f.javaConstructor != null, "Fail f constructor")
     val c = f.javaConstructor!!
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/noKotlinReflect/reifiedTypeJavaClass.kt b/compiler/testData/codegen/boxWithStdlib/reflection/noKotlinReflect/reifiedTypeJavaClass.kt
index 0d8d309e4c5..3f5912a3ab3 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/noKotlinReflect/reifiedTypeJavaClass.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/noKotlinReflect/reifiedTypeJavaClass.kt
@@ -4,10 +4,10 @@ import kotlin.test.assertEquals
 
 class Klass
 
-inline fun <reified T> simpleName(): String =
+inline fun <reified T : Any> simpleName(): String =
         T::class.java.getSimpleName()
 
-inline fun <reified T> simpleName2(): String {
+inline fun <reified T : Any> simpleName2(): String {
     val kClass = T::class // Intrinsic for T::class.java is not used
     return kClass.java.getSimpleName()
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/DIExample.kt b/compiler/testData/codegen/boxWithStdlib/reified/DIExample.kt
index 4d8bc710219..95ad5cbad15 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/DIExample.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/DIExample.kt
@@ -9,7 +9,7 @@ class Project {
         }
 }
 
-inline fun <reified T> Project.get(t: Any?, p: PropertyMetadata): T = getInstance(javaClass<T>())
+inline fun <reified T : Any> Project.get(t: Any?, p: PropertyMetadata): T = getInstance(javaClass<T>())
 
 val project = Project()
 val x1: Int by project
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/anonymousObject.kt b/compiler/testData/codegen/boxWithStdlib/reified/anonymousObject.kt
index 0b36c0ed49f..201975c5901 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/anonymousObject.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/anonymousObject.kt
@@ -4,7 +4,7 @@ abstract class A {
     abstract fun f(): String
 }
 
-inline fun<reified T> foo(): A {
+inline fun<reified T : Any> foo(): A {
     return object : A() {
         override fun f(): String {
             return javaClass<T>().getName()
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/anonymousObjectNoPropagate.kt b/compiler/testData/codegen/boxWithStdlib/reified/anonymousObjectNoPropagate.kt
index b9ff3a1cd9a..85d21973bb6 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/anonymousObjectNoPropagate.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/anonymousObjectNoPropagate.kt
@@ -11,15 +11,15 @@ inline fun doWorkInline(block: () -> String) = block()
 
 fun box(): String {
     val x = object {
-        inline fun <reified T> bar1(): A = object : A {
+        inline fun <reified T : Any> bar1(): A = object : A {
             override fun f1(): String = javaClass<T>().getName()
             override fun f2(): String = doWork { javaClass<T>().getName() }
             override fun f3(): String = doWorkInline { javaClass<T>().getName() }
         }
 
-        inline fun <reified T> bar2() = javaClass<T>().getName()
-        inline fun <reified T> bar3() = doWork { javaClass<T>().getName() }
-        inline fun <reified T> bar4() = doWorkInline { javaClass<T>().getName() }
+        inline fun <reified T : Any> bar2() = javaClass<T>().getName()
+        inline fun <reified T : Any> bar3() = doWork { javaClass<T>().getName() }
+        inline fun <reified T : Any> bar4() = doWorkInline { javaClass<T>().getName() }
     }
 
     val y: A = x.bar1<String>()
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/defaultJavaClass.kt b/compiler/testData/codegen/boxWithStdlib/reified/defaultJavaClass.kt
index 462611eab6b..51d238a7acc 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/defaultJavaClass.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/defaultJavaClass.kt
@@ -1,8 +1,8 @@
 import kotlin.test.assertEquals
 
-inline fun <reified T> foo(x: Class<T> = javaClass<T>()): String = x.getName()
+inline fun <reified T : Any> foo(x: Class<T> = javaClass<T>()): String = x.getName()
 
-inline fun <reified R> bar(x: R): String = foo<R>()
+inline fun <reified R : Any> bar(x: R): String = foo<R>()
 
 fun box(): String {
     assertEquals("java.lang.String", foo<String>())
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/javaClass.kt b/compiler/testData/codegen/boxWithStdlib/reified/javaClass.kt
index 7159bd28763..9ff1298fa60 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/javaClass.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/javaClass.kt
@@ -1,6 +1,6 @@
 import kotlin.test.assertEquals
 
-inline fun<reified T> javaClassName(): String {
+inline fun<reified T : Any> javaClassName(): String {
     return javaClass<T>().getName()
 }
 
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/nestedReified.kt b/compiler/testData/codegen/boxWithStdlib/reified/nestedReified.kt
index 4d5b463c553..6158a3bc72a 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/nestedReified.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/nestedReified.kt
@@ -1,8 +1,8 @@
 import kotlin.test.assertEquals
 
-inline fun <reified T, reified R> foo(): Array<String> {
+inline fun <reified T : Any, reified R : Any> foo(): Array<String> {
     val x = object {
-        inline fun <reified T1, reified T> bar(): Array<String> = array(
+        inline fun <reified T1 : Any, reified T : Any> bar(): Array<String> = array(
                 javaClass<T1>().getName(), javaClass<T>().getName(), javaClass<R>().getName()
         )
         fun f1() = bar<T, R>()
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/nonInlineableLambdaInReifiedFunction.kt b/compiler/testData/codegen/boxWithStdlib/reified/nonInlineableLambdaInReifiedFunction.kt
index 72baad4ecc5..a5743434ea7 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/nonInlineableLambdaInReifiedFunction.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/nonInlineableLambdaInReifiedFunction.kt
@@ -1,10 +1,10 @@
 import kotlin.test.assertEquals
 
 fun foo(block: () -> String) = block()
-inline fun<reified T> bar1(x: T): String = foo() {
+inline fun<reified T : Any> bar1(x: T): String = foo() {
     javaClass<T>().getName()
 }
-inline fun<reified T> bar2(x: T, y: String): String = foo() {
+inline fun<reified T : Any> bar2(x: T, y: String): String = foo() {
     javaClass<T>().getName() + "#" + y
 }
 
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/recursiveNonInlineableLambda.kt b/compiler/testData/codegen/boxWithStdlib/reified/recursiveNonInlineableLambda.kt
index cc3d6934471..ec41a2904a8 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/recursiveNonInlineableLambda.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/recursiveNonInlineableLambda.kt
@@ -2,14 +2,14 @@ import kotlin.test.assertEquals
 
 fun foo(block: () -> String) = block()
 
-inline fun<reified T> bar1(): String = foo() {
+inline fun<reified T : Any> bar1(): String = foo() {
     javaClass<T>().getName()
 }
-inline fun<reified T> bar2(y: String): String = foo() {
+inline fun<reified T : Any> bar2(y: String): String = foo() {
     javaClass<T>().getName() + "#" + y
 }
 
-inline fun<T1, T2, reified R1, reified R2> bar3(y: String) =
+inline fun<T1, T2, reified R1 : Any, reified R2 : Any> bar3(y: String) =
         Pair(bar1<R1>(), bar2<R2>(y))
 
 fun box(): String {
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineFunOfObject.kt b/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineFunOfObject.kt
index 610af457377..b20587701d8 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineFunOfObject.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineFunOfObject.kt
@@ -9,7 +9,7 @@ interface A {
 
 fun box(): String {
     val x: A = object : A {
-        private inline fun <reified T> localClassName(): String = javaClass<T>().getName()
+        private inline fun <reified T : Any> localClassName(): String = javaClass<T>().getName()
         override fun f(): String = foo { localClassName<String>() }
         override fun g(): String = foo { localClassName<Int>() }
     }
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineFunOfObjectWithinReified.kt b/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineFunOfObjectWithinReified.kt
index 0796b64399e..4816da556ef 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineFunOfObjectWithinReified.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineFunOfObjectWithinReified.kt
@@ -2,15 +2,15 @@ import kotlin.test.assertEquals
 
 fun foo(block: () -> String) = block()
 
-inline fun <reified T> className(): String = javaClass<T>().getName()
+inline fun <reified T : Any> className(): String = javaClass<T>().getName()
 
-inline fun <reified T> lambdaShouldBeReified(): String = foo { className<T>() }
+inline fun <reified T : Any> lambdaShouldBeReified(): String = foo { className<T>() }
 
 interface A {
     fun f(): String
     fun g(): String
 }
-inline fun<reified T1, reified T2> AFactory(): A = object : A {
+inline fun<reified T1 : Any, reified T2 : Any> AFactory(): A = object : A {
     override fun f(): String = className<T1>()
     override fun g(): String = foo { className<T2>() }
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineIntoNonInlineableLambda.kt b/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineIntoNonInlineableLambda.kt
index 542b658441a..616fcc270ef 100644
--- a/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineIntoNonInlineableLambda.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineIntoNonInlineableLambda.kt
@@ -2,7 +2,7 @@ import kotlin.test.assertEquals
 
 fun foo(block: () -> String) = block()
 
-inline fun<reified T> className(): String = javaClass<T>().getName()
+inline fun<reified T : Any> className(): String = javaClass<T>().getName()
 
 interface A {
     fun f(): String
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetWithGeneric.kt b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetWithGeneric.kt
index 0f782fe4613..ebf4ec533b2 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetWithGeneric.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetWithGeneric.kt
@@ -1,3 +1,4 @@
+// !DIAGNOSTICS: -UNUSED_PARAMETER
 class A
 
 class B {
@@ -14,7 +15,6 @@ val cTopLevel: Int by Delegate<Nothing?>()
 
 class Delegate<T> {
   fun get(t: T, p: PropertyMetadata): Int {
-    t.equals(p) // to avoid UNUSED_PARAMETER warning
     return 1
   }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.kt b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.kt
index bbcef2b140c..ba9e060a0c2 100644
--- a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.kt
+++ b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.kt
@@ -40,7 +40,7 @@ fun test5() {
 fun <R: Any> R?.sure() : R = this!!
 
 fun <T> test6(l: List<T>?) {
-    <!TYPE_MISMATCH!>l<!>.sure<T>()
+    <!TYPE_MISMATCH!>l<!>.sure<<!UPPER_BOUND_VIOLATED!>T<!>>()
 }
 
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt742.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt742.kt
index b26cfa17e88..79c1e172fff 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt742.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt742.kt
@@ -9,4 +9,4 @@ fun <T, Q> List<T>.map1(f: (T)-> Q): List<T>? = tail!!.map1(f)
 
 fun <T, Q> List<T>.map2(f: (T)-> Q): List<T>? = tail.sure().map2(f)
 
-fun <T, Q> List<T>.map3(f: (T)-> Q): List<T>? = <!TYPE_MISMATCH!>tail<!>.sure<T>().<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>map3<!>(f)
\ No newline at end of file
+fun <T, Q> List<T>.map3(f: (T)-> Q): List<T>? = <!TYPE_MISMATCH!>tail<!>.sure<<!UPPER_BOUND_VIOLATED!>T<!>>().<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>map3<!>(f)
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.kt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.kt
index 60aeb37c85f..3613677f32f 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.kt
@@ -1,4 +1,4 @@
 package test
 
-public class ClassWithTypePRefSelf<P : kotlin.Enum<P>?>() {
+public class ClassWithTypePRefSelf<P : kotlin.Enum<P>>() {
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.txt
index c8e1c800fb6..b75dbabb58e 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.txt
@@ -1,5 +1,5 @@
 package test
 
-public final class ClassWithTypePRefSelf</*0*/ P : kotlin.Enum<P>?> {
-    /*primary*/ public constructor ClassWithTypePRefSelf</*0*/ P : kotlin.Enum<P>?>()
+public final class ClassWithTypePRefSelf</*0*/ P : kotlin.Enum<P>> {
+    /*primary*/ public constructor ClassWithTypePRefSelf</*0*/ P : kotlin.Enum<P>>()
 }
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/mapGet.kt b/idea/testData/intentions/removeExplicitTypeArguments/mapGet.kt
index 3b2e3305129..2826fb17b51 100644
--- a/idea/testData/intentions/removeExplicitTypeArguments/mapGet.kt
+++ b/idea/testData/intentions/removeExplicitTypeArguments/mapGet.kt
@@ -5,7 +5,7 @@ interface MyMap {
 }
 
 class A(val map: MyMap) {
-    fun <T> foo(`type`: I<T>) {
+    fun <T : Any> foo(`type`: I<T>) {
         val value = map.get<caret><T>(`type`)
     }
 }
\ No newline at end of file
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/mapGet.kt.after b/idea/testData/intentions/removeExplicitTypeArguments/mapGet.kt.after
index 1d42eb79e7e..d698bf4e190 100644
--- a/idea/testData/intentions/removeExplicitTypeArguments/mapGet.kt.after
+++ b/idea/testData/intentions/removeExplicitTypeArguments/mapGet.kt.after
@@ -5,7 +5,7 @@ interface MyMap {
 }
 
 class A(val map: MyMap) {
-    fun <T> foo(`type`: I<T>) {
+    fun <T : Any> foo(`type`: I<T>) {
         val value = map.get<caret>(`type`)
     }
 }
\ No newline at end of file
diff --git a/libraries/stdlib/test/language/RangeIterationJVMTest.kt b/libraries/stdlib/test/language/RangeIterationJVMTest.kt
index cef97c40cda..13886cebb69 100644
--- a/libraries/stdlib/test/language/RangeIterationJVMTest.kt
+++ b/libraries/stdlib/test/language/RangeIterationJVMTest.kt
@@ -17,7 +17,7 @@ import kotlin.test.*
 
 // Test data for codegen is generated from this class. If you change it, rerun GenerateTests
 public class RangeIterationJVMTest {
-    private fun <N> doTest(
+    private fun <N : Any> doTest(
             sequence: Progression<N>,
             expectedStart: N,
             expectedEnd: N,
diff --git a/libraries/stdlib/test/language/RangeIterationTest.kt b/libraries/stdlib/test/language/RangeIterationTest.kt
index bab70b5175a..a963799a312 100644
--- a/libraries/stdlib/test/language/RangeIterationTest.kt
+++ b/libraries/stdlib/test/language/RangeIterationTest.kt
@@ -5,7 +5,7 @@ import kotlin.test.*
 
 // Test data for codegen is generated from this class. If you change it, rerun GenerateTests
 public class RangeIterationTest {
-    private fun <N> doTest(
+    private fun <N : Any> doTest(
             sequence: Progression<N>,
             expectedStart: N,
             expectedEnd: N,
diff --git a/libraries/stdlib/test/properties/delegation/DelegationTest.kt b/libraries/stdlib/test/properties/delegation/DelegationTest.kt
index 43f3984f824..4930b7e8b07 100644
--- a/libraries/stdlib/test/properties/delegation/DelegationTest.kt
+++ b/libraries/stdlib/test/properties/delegation/DelegationTest.kt
@@ -10,7 +10,7 @@ class NotNullVarTest() {
     }
 }
 
-private class NotNullVarTestGeneric<T>(val a1: String, val b1: T) {
+private class NotNullVarTestGeneric<T : Any>(val a1: String, val b1: T) {
     var a: String by Delegates.notNull()
     var b by Delegates.notNull<T>()