diff --git a/compiler/testData/codegen/bytecodeText/signature/noSignatureInSyntheticAccessor.kt b/compiler/testData/codegen/bytecodeText/signature/noSignatureInSyntheticAccessor.kt
deleted file mode 100644
index 170539cdb2b..00000000000
--- a/compiler/testData/codegen/bytecodeText/signature/noSignatureInSyntheticAccessor.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-class MyList<T> {
-
-    private fun noSignature(): T? = null
-
-    fun withSignature(): T? = null
-
-    fun removeHeader() {
-        fun a () {
-            noSignature()
-        }
-    }
-}
-
-/*
-Class signature,
-local fun class signature,
-'noSignature' and 'withSignature' fun signatures
- */
-
-// 4 signature
-// 2 signature \(\)TT\;
-// 1 signature Lkotlin/jvm/internal/Lambda\;Lkotlin/jvm/functions/Function0<Lkotlin/Unit\;>\;
-// 1 signature <T:Ljava/lang/Object\;>Ljava/lang/Object\;
-// 1 public final static synthetic access\$noSignature\(LMyList\;\)Ljava/lang/Object
\ No newline at end of file
diff --git a/compiler/testData/writeSignature/syntheticAccessorForGeneric.kt b/compiler/testData/writeSignature/syntheticAccessorForGeneric.kt
new file mode 100644
index 00000000000..49ccfe277dc
--- /dev/null
+++ b/compiler/testData/writeSignature/syntheticAccessorForGeneric.kt
@@ -0,0 +1,20 @@
+class MyList<T> {
+
+    private fun noSignature(): T? = null
+
+    fun withSignature(): T? = null
+
+    fun removeHeader() {
+        fun a () {
+            noSignature()
+        }
+    }
+}
+
+// method: MyList::withSignature
+// jvm signature: ()Ljava/lang/Object;
+// generic signature: ()TT;
+
+// method: MyList::access$noSignature
+// jvm signature: (LMyList;)Ljava/lang/Object;
+// generic signature: null
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java
index aaf8bc96b87..27d35746b74 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java
@@ -1106,21 +1106,6 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
         }
     }
 
-    @TestMetadata("compiler/testData/codegen/bytecodeText/signature")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Signature extends AbstractBytecodeTextTest {
-        public void testAllFilesPresentInSignature() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/signature"), Pattern.compile("^(.+)\\.kt$"), true);
-        }
-
-        @TestMetadata("noSignatureInSyntheticAccessor.kt")
-        public void testNoSignatureInSyntheticAccessor() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/signature/noSignatureInSyntheticAccessor.kt");
-            doTest(fileName);
-        }
-    }
-
     @TestMetadata("compiler/testData/codegen/bytecodeText/statements")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java
index d28119aedd5..ad7a8344f7b 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java
@@ -137,6 +137,12 @@ public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest {
         doTest(fileName);
     }
 
+    @TestMetadata("syntheticAccessorForGeneric.kt")
+    public void testSyntheticAccessorForGeneric() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/syntheticAccessorForGeneric.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("VarargCharSequence.kt")
     public void testVarargCharSequence() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/VarargCharSequence.kt");