diff --git a/compiler/testData/writeSignature/declarationSiteVariance/MappedSupertypeWithVariance.kt b/compiler/testData/writeSignature/declarationSiteVariance/MappedSupertypeWithVariance.kt
index 0b99bc77992..c6c4eb6ce97 100644
--- a/compiler/testData/writeSignature/declarationSiteVariance/MappedSupertypeWithVariance.kt
+++ b/compiler/testData/writeSignature/declarationSiteVariance/MappedSupertypeWithVariance.kt
@@ -3,4 +3,4 @@ interface Derived<A>: List<A>
 
 // class: Derived
 // jvm signature:     Derived
-// generic signature: <A:Ljava/lang/Object;>Ljava/lang/Object;Ljava/util/List<TA;>;
+// generic signature: <A:Ljava/lang/Object;>Ljava/lang/Object;Ljava/util/List<TA;>;Lkotlin/jvm/internal/markers/KMappedMarker;
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt
index 24db8b9ae91..641a3d3bf77 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt
@@ -90,6 +90,7 @@ public abstract class AbstractWriteSignatureTest : TestCaseWithTmpdir() {
                 classSuitesByClassName.getOrPut(className) { ClassExpectationsSuite(className) }
 
         fun check() {
+            Assert.assertTrue(classSuitesByClassName.isNotEmpty())
             classSuitesByClassName.values().forEach { it.check() }
         }
 
@@ -196,9 +197,6 @@ public abstract class AbstractWriteSignatureTest : TestCaseWithTmpdir() {
                 if (kind == "class" && memberName != null) {
                     throw AssertionError("$ktFile:${lineNo+1}: use $className\$$memberName to denote inner class")
                 }
-                else if (memberName == null) {
-                    throw AssertionError("$ktFile:${lineNo+1}: '$kind' requires member name (after $className::)")
-                }
 
                 val jvmSignatureMatch = jvmSignatureRegex.matchExact(lines[lineNo+1])
                 val genericSignatureMatch = genericSignatureRegex.matchExact(lines[lineNo+2])
@@ -237,7 +235,7 @@ public abstract class AbstractWriteSignatureTest : TestCaseWithTmpdir() {
 // jvm signature: $jvmSignature
 // generic signature: $genericSignature"""
 
-        val expectationRegex = Regex("^// (class|method|field): *([^:]+)(::(.+)) *(//.*)?")
+        val expectationRegex = Regex("^// (class|method|field): *([^:]+)(::(.+))? *(//.*)?")
         val jvmSignatureRegex = Regex("^// jvm signature: *(.+) *(//.*)?")
         val genericSignatureRegex = Regex("^// generic signature: *(.+) *(//.*)?")