diff --git a/compiler/testData/diagnostics/tests/extensions/GenericIterator.kt b/compiler/testData/diagnostics/tests/extensions/GenericIterator.kt
index f8a506a3500..5fbb228f3e8 100644
--- a/compiler/testData/diagnostics/tests/extensions/GenericIterator.kt
+++ b/compiler/testData/diagnostics/tests/extensions/GenericIterator.kt
@@ -1,6 +1,6 @@
 import java.util.Enumeration
 
-inline fun <T> java.util.Enumeration<T>.iterator() = object: Iterator<T> {
+fun <T> java.util.Enumeration<T>.iterator() = object: Iterator<T> {
   override fun hasNext(): Boolean = hasMoreElements()
 
   override fun next() = nextElement()
diff --git a/compiler/testData/diagnostics/tests/extensions/GenericIterator2.kt b/compiler/testData/diagnostics/tests/extensions/GenericIterator2.kt
index 8cfec0eaec8..ca37d4b8b4f 100644
--- a/compiler/testData/diagnostics/tests/extensions/GenericIterator2.kt
+++ b/compiler/testData/diagnostics/tests/extensions/GenericIterator2.kt
@@ -1,6 +1,6 @@
 import java.util.Enumeration
 
-inline fun <T> java.util.Enumeration<T>.iterator() = object : Iterator<T> {
+fun <T> java.util.Enumeration<T>.iterator() = object : Iterator<T> {
   public override fun hasNext(): Boolean = hasMoreElements()
 
   public override fun next() = nextElement()
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.kt b/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.kt
index a87baa5505d..cb4aefda33a 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.kt
@@ -6,6 +6,6 @@ fun Array<Int>.toIntArray(): IntArray = this.<!TYPE_INFERENCE_UPPER_BOUND_VIOLAT
 
 fun Array<Int>.toArrayList(): ArrayList<Int> = this.mapTo(ArrayList<Int>(size), {it})
 
-public inline fun <T, R, C: MutableCollection<in R>> Array<out T>.mapTo(result: C, transform : (T) -> R) : C =
+public fun <T, R, C: MutableCollection<in R>> Array<out T>.mapTo(result: C, transform : (T) -> R) : C =
         throw Exception("$result $transform")
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/compareBy.kt b/compiler/testData/diagnostics/tests/inference/regressions/compareBy.kt
index 50a113db324..b88b8fda8cc 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/compareBy.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/compareBy.kt
@@ -5,5 +5,5 @@ class Item(val name: String, val rating: Int): Comparable<Item> {
 }
 
 // from standard library
-inline fun <T : Any> compareBy(<!UNUSED_PARAMETER!>a<!>: T?, <!UNUSED_PARAMETER!>b<!>: T?,
+fun <T : Any> compareBy(<!UNUSED_PARAMETER!>a<!>: T?, <!UNUSED_PARAMETER!>b<!>: T?,
                                vararg <!UNUSED_PARAMETER!>functions<!>: T.() -> Comparable<*>?): Int = throw Exception()
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2842.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2842.kt
index fe3761ca6a1..14aea41848c 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2842.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2842.kt
@@ -14,7 +14,7 @@ fun test(nullabilityInfoMap: Map<Int, Any>?) {
 }
 
 //resolves to
-public inline fun <K,V> Map<K,V>.iterator(): Iterator<Map.Entry<K,V>> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
+public fun <K,V> Map<K,V>.iterator(): Iterator<Map.Entry<K,V>> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
 
 
 //-------------
diff --git a/compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.kt b/compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.kt
index 37cb33c319e..0254636798a 100644
--- a/compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.kt
+++ b/compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.kt
@@ -1,4 +1,4 @@
-public inline fun <T: Any> iterate(initialValue: T, nextFunction: (T) -> T?): Iterator<T> =
+public fun <T: Any> iterate(initialValue: T, nextFunction: (T) -> T?): Iterator<T> =
         throw Exception("$initialValue $nextFunction")
 
 fun foo() {
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.kt b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.kt
index d6684483699..cb8750d6cd0 100644
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.kt
+++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
+// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NOTHING_TO_INLINE
 private class Z public (){
     public val publicProperty:Int = 12
     public fun publicFun() {}
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicInnerClass.kt b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicInnerClass.kt
index 31c1667d985..41327857602 100644
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicInnerClass.kt
+++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicInnerClass.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
+// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NOTHING_TO_INLINE
 private class Z2 {
     private val privateProperty = 11;
 
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPackage.kt b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPackage.kt
index dae313f5c1a..71c9cddb246 100644
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPackage.kt
+++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPackage.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
+// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NOTHING_TO_INLINE
 
 private val privateProperty = 11;
 private fun privateFun() {}
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPublicClass.kt b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPublicClass.kt
index 0b1932fc6a9..00ab0bb9eca 100644
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPublicClass.kt
+++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPublicClass.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
+// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NOTHING_TO_INLINE
 public class Z {
     val privateProperty = 11;
 
diff --git a/compiler/testData/diagnostics/tests/regressions/kt860.kt b/compiler/testData/diagnostics/tests/regressions/kt860.kt
index 5e383cf5b9d..0058d71af04 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt860.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt860.kt
@@ -1,3 +1,4 @@
+// !DIAGNOSTICS: -NOTHING_TO_INLINE
 // KT-860 ConcurrentModificationException in frontend
 
 package kotlin.util
@@ -10,4 +11,4 @@ fun <T, U: MutableCollection<in T>> Iterator<T>.to(container: U) : U {
     return container
 }
 
-inline fun <T> Iterator<T>.toArrayList() = to(ArrayList<T>())
+fun <T> Iterator<T>.toArrayList() = to(ArrayList<T>())
diff --git a/js/js.libraries/src/stdlib/testCode.kt b/js/js.libraries/src/stdlib/testCode.kt
index 80c9c2b660f..3371d3af2d7 100644
--- a/js/js.libraries/src/stdlib/testCode.kt
+++ b/js/js.libraries/src/stdlib/testCode.kt
@@ -4,7 +4,7 @@ package kotlin.test
  * Comments out a block of test code until it is implemented while keeping a link to the code
  * to implement in your unit test output
  */
-public inline fun todo(block: ()-> Any) {
+public fun todo(block: ()-> Any) {
     // println("TODO at " + (Exception() as java.lang.Throwable).getStackTrace()?.get(1) + " for " + block)
     println("TODO at " + block)
 }
diff --git a/js/js.translator/testFiles/extensionFunction/cases/extensionOnClassWithExplicitAndImplicitReceiver.kt b/js/js.translator/testFiles/extensionFunction/cases/extensionOnClassWithExplicitAndImplicitReceiver.kt
index 61fe31dfcfa..98f2d52bee7 100644
--- a/js/js.translator/testFiles/extensionFunction/cases/extensionOnClassWithExplicitAndImplicitReceiver.kt
+++ b/js/js.translator/testFiles/extensionFunction/cases/extensionOnClassWithExplicitAndImplicitReceiver.kt
@@ -1,8 +1,8 @@
 package foo
 
-class Foo {
+public class Foo {
 
-  fun blah(): Int {
+  public fun blah(): Int {
     return 5
   }