diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt
index fbb04981ab4..8e8665a96fa 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt
@@ -1,9 +1,8 @@
-// !LANGUAGE: -NewInference
+// !WITH_NEW_INFERENCE
 // SKIP_TXT
 // WITH_RUNTIME
-// COMMON_COROUTINES_TEST
 
-import COROUTINES_PACKAGE.*
+import kotlin.coroutines.*
 
 interface Job : CoroutineContext.Element {}
 interface Deferred<out T> : Job {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292_ni.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292_ni.kt
deleted file mode 100644
index c1599d6ce17..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292_ni.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-// !LANGUAGE: +NewInference
-// SKIP_TXT
-// WITH_RUNTIME
-
-import kotlin.coroutines.*
-
-interface Job : CoroutineContext.Element {}
-interface Deferred<out T> : Job {
-    suspend fun await(): T
-}
-fun <T> async(<!UNUSED_PARAMETER!>block<!>: suspend () -> T): Deferred<T> = TODO()
-
-suspend fun fib(n: Long) =
-    async {
-        when {
-            n < 2 -> n
-            else -> <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!><!DEBUG_INFO_MISSING_UNRESOLVED!>fib<!>(<!DEBUG_INFO_MISSING_UNRESOLVED!>n<!> <!DEBUG_INFO_MISSING_UNRESOLVED!>-<!> 1)<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>await<!>() <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> fib(n - 2).<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>await<!>()
-        }
-    }
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java
index dba56983255..4955e12400b 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java
@@ -1544,18 +1544,8 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW
         }
 
         @TestMetadata("kt18292.kt")
-        public void testKt18292_1_2() throws Exception {
-            runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt", "kotlin.coroutines.experimental");
-        }
-
-        @TestMetadata("kt18292.kt")
-        public void testKt18292_1_3() throws Exception {
-            runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt", "kotlin.coroutines");
-        }
-
-        @TestMetadata("kt18292_ni.kt")
-        public void testKt18292_ni() throws Exception {
-            runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292_ni.kt");
+        public void testKt18292() throws Exception {
+            runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt");
         }
 
         @TestMetadata("kt28658.kt")
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java
index c0ff3e177a6..ecff3d1f8f9 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java
@@ -1544,18 +1544,8 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno
         }
 
         @TestMetadata("kt18292.kt")
-        public void testKt18292_1_2() throws Exception {
-            runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt", "kotlin.coroutines.experimental");
-        }
-
-        @TestMetadata("kt18292.kt")
-        public void testKt18292_1_3() throws Exception {
-            runTestWithPackageReplacement("compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt", "kotlin.coroutines");
-        }
-
-        @TestMetadata("kt18292_ni.kt")
-        public void testKt18292_ni() throws Exception {
-            runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292_ni.kt");
+        public void testKt18292() throws Exception {
+            runTest("compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt");
         }
 
         @TestMetadata("kt28658.kt")