diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.txt b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.txt
index cf40b0278de..1ed2f34592f 100644
--- a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.txt
+++ b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineContextIntrinsic.txt
@@ -4,7 +4,7 @@ final class CoroutineContextIntrinsicKt$notTailCall$1 {
     synthetic field data: java.lang.Object
     synthetic field exception: java.lang.Throwable
     inner (anonymous) class CoroutineContextIntrinsicKt$notTailCall$1
-    method <init>(p0: COROUTINES_PACKAGE.Continuation): void
+    method <init>(p0: kotlin.coroutines.experimental.Continuation): void
     public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object
     synthetic final method getLabel(): int
     synthetic final method setLabel(p0: int): void
@@ -14,8 +14,8 @@ final class CoroutineContextIntrinsicKt$notTailCall$1 {
 public final class CoroutineContextIntrinsicKt {
     // source: 'coroutineContextIntrinsic.kt'
     inner (anonymous) class CoroutineContextIntrinsicKt$notTailCall$1
-    public final static @org.jetbrains.annotations.Nullable method mustBeTailCall(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object
-    public final static @org.jetbrains.annotations.Nullable method notTailCall(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object
-    public final static @org.jetbrains.annotations.Nullable method retrieveCoroutineContext(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object
-    public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.CoroutineContext, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): java.lang.Object
+    public final static @org.jetbrains.annotations.Nullable method mustBeTailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object
+    public final static @org.jetbrains.annotations.Nullable method notTailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object
+    public final static @org.jetbrains.annotations.Nullable method retrieveCoroutineContext(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object
+    public final static @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.CoroutineContext, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): java.lang.Object
 }
diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.txt b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.txt
index dd061f55725..0f11fa790cb 100644
--- a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.txt
+++ b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields.txt
@@ -6,7 +6,7 @@ final class Controller$multipleSuspensions$1 {
     synthetic field exception: java.lang.Throwable
     synthetic final field this$0: Controller
     inner (anonymous) class Controller$multipleSuspensions$1
-    method <init>(p0: Controller, p1: COROUTINES_PACKAGE.Continuation): void
+    method <init>(p0: Controller, p1: kotlin.coroutines.experimental.Continuation): void
     public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object
     synthetic final method getLabel(): int
     synthetic final method setLabel(p0: int): void
@@ -19,7 +19,7 @@ final class Controller$nonTailCall$1 {
     synthetic field exception: java.lang.Throwable
     synthetic final field this$0: Controller
     inner (anonymous) class Controller$nonTailCall$1
-    method <init>(p0: Controller, p1: COROUTINES_PACKAGE.Continuation): void
+    method <init>(p0: Controller, p1: kotlin.coroutines.experimental.Continuation): void
     public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object
     synthetic final method getLabel(): int
     synthetic final method setLabel(p0: int): void
@@ -31,10 +31,10 @@ public final class Controller {
     inner (anonymous) class Controller$multipleSuspensions$1
     inner (anonymous) class Controller$nonTailCall$1
     public method <init>(): void
-    public final @org.jetbrains.annotations.Nullable method multipleSuspensions(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object
-    public final @org.jetbrains.annotations.Nullable method nonTailCall(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object
-    public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object
-    public final @org.jetbrains.annotations.Nullable method tailCall(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method multipleSuspensions(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method nonTailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method suspendHere(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method tailCall(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object
 }
 
 @kotlin.Metadata
@@ -45,8 +45,8 @@ final class CoroutineFieldsKt$box$1 {
     private synthetic field L$0: java.lang.Object
     field L$1: java.lang.Object
     inner (anonymous) class CoroutineFieldsKt$box$1
-    method <init>(p0: kotlin.jvm.internal.Ref$ObjectRef, p1: COROUTINES_PACKAGE.Continuation): void
-    public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: COROUTINES_PACKAGE.Continuation): COROUTINES_PACKAGE.Continuation
+    method <init>(p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.coroutines.experimental.Continuation): void
+    public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.experimental.Continuation): kotlin.coroutines.experimental.Continuation
     public final @org.jetbrains.annotations.Nullable method doResume(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.Nullable p1: java.lang.Throwable): java.lang.Object
     public final method invoke(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
 }
diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun.txt b/compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun.txt
index 5351c87aa98..411031c39cf 100644
--- a/compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun.txt
+++ b/compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun.txt
@@ -2,12 +2,12 @@
 public class AbstractStuff {
     // source: 'suspendReifiedFun.kt'
     public method <init>(): void
-    public synthetic final method hello(p0: java.lang.Object, p1: COROUTINES_PACKAGE.Continuation): java.lang.Object
+    public synthetic final method hello(p0: java.lang.Object, p1: kotlin.coroutines.experimental.Continuation): java.lang.Object
 }
 
 @kotlin.Metadata
 public final class Stuff {
     // source: 'suspendReifiedFun.kt'
     public method <init>(): void
-    public final @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: COROUTINES_PACKAGE.Continuation): java.lang.Object
+    public final @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.experimental.Continuation): java.lang.Object
 }
diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun_1_3.txt b/compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun_1_3.txt
new file mode 100644
index 00000000000..99de7cee8da
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/coroutines/suspendReifiedFun_1_3.txt
@@ -0,0 +1,13 @@
+@kotlin.Metadata
+public class AbstractStuff {
+    // source: 'suspendReifiedFun.kt'
+    public method <init>(): void
+    public synthetic final method hello(p0: java.lang.Object, p1: kotlin.coroutines.Continuation): java.lang.Object
+}
+
+@kotlin.Metadata
+public final class Stuff {
+    // source: 'suspendReifiedFun.kt'
+    public method <init>(): void
+    public final @org.jetbrains.annotations.Nullable method foo(@org.jetbrains.annotations.NotNull p0: kotlin.coroutines.Continuation): java.lang.Object
+}
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt
index 7b2aaea39df..654e3b5385d 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt
@@ -29,9 +29,7 @@ abstract class AbstractBytecodeListingTest : CodegenTestCase() {
             prefixes.firstNotNullResult { File(wholeFile.parentFile, wholeFile.nameWithoutExtension + "$it.txt").takeIf(File::exists) }
                 .sure { "No testData file exists: ${wholeFile.nameWithoutExtension}.txt" }
 
-        KotlinTestUtils.assertEqualsToFile(txtFile, actualTxt) {
-            it.replace("COROUTINES_PACKAGE", coroutinesPackage)
-        }
+        KotlinTestUtils.assertEqualsToFile(txtFile, actualTxt)
     }
 
     private fun isWithSignatures(wholeFile: File): Boolean =