diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
index ab5f15c2844..0f37473dbbf 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
@@ -2569,12 +2569,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
                     runTest("compiler/testData/diagnostics/tests/annotations/repeatable/javaRepeatableInKotlin.kt");
                 }
 
-                @Test
-                @TestMetadata("javaRepeatableJvmTarget6.kt")
-                public void testJavaRepeatableJvmTarget6() throws Exception {
-                    runTest("compiler/testData/diagnostics/tests/annotations/repeatable/javaRepeatableJvmTarget6.kt");
-                }
-
                 @Test
                 @TestMetadata("javaRepeatable_1_5.kt")
                 public void testJavaRepeatable_1_5() throws Exception {
@@ -36478,12 +36472,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
                         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithCompatibility"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
                     }
 
-                    @Test
-                    @TestMetadata("target6.kt")
-                    public void testTarget6() throws Exception {
-                        runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithCompatibility/target6.kt");
-                    }
-
                     @Test
                     @TestMetadata("target8.kt")
                     public void testTarget8() throws Exception {
@@ -36506,12 +36494,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
                         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithoutCompatibility"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
                     }
 
-                    @Test
-                    @TestMetadata("target6.kt")
-                    public void testTarget6() throws Exception {
-                        runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithoutCompatibility/target6.kt");
-                    }
-
                     @Test
                     @TestMetadata("target8.kt")
                     public void testTarget8() throws Exception {
@@ -36707,12 +36689,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
                     runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL12.kt");
                 }
 
-                @Test
-                @TestMetadata("interfaceCompanion_LL13_16.kt")
-                public void testInterfaceCompanion_LL13_16() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_16.kt");
-                }
-
                 @Test
                 @TestMetadata("interfaceCompanion_LL13_18.kt")
                 public void testInterfaceCompanion_LL13_18() throws Exception {
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
index c632124629e..b8687268338 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
@@ -2569,12 +2569,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
                     runTest("compiler/testData/diagnostics/tests/annotations/repeatable/javaRepeatableInKotlin.kt");
                 }
 
-                @Test
-                @TestMetadata("javaRepeatableJvmTarget6.kt")
-                public void testJavaRepeatableJvmTarget6() throws Exception {
-                    runTest("compiler/testData/diagnostics/tests/annotations/repeatable/javaRepeatableJvmTarget6.kt");
-                }
-
                 @Test
                 @TestMetadata("javaRepeatable_1_5.kt")
                 public void testJavaRepeatable_1_5() throws Exception {
@@ -36478,12 +36472,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
                         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithCompatibility"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
                     }
 
-                    @Test
-                    @TestMetadata("target6.kt")
-                    public void testTarget6() throws Exception {
-                        runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithCompatibility/target6.kt");
-                    }
-
                     @Test
                     @TestMetadata("target8.kt")
                     public void testTarget8() throws Exception {
@@ -36506,12 +36494,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
                         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithoutCompatibility"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
                     }
 
-                    @Test
-                    @TestMetadata("target6.kt")
-                    public void testTarget6() throws Exception {
-                        runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithoutCompatibility/target6.kt");
-                    }
-
                     @Test
                     @TestMetadata("target8.kt")
                     public void testTarget8() throws Exception {
@@ -36707,12 +36689,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
                     runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL12.kt");
                 }
 
-                @Test
-                @TestMetadata("interfaceCompanion_LL13_16.kt")
-                public void testInterfaceCompanion_LL13_16() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_16.kt");
-                }
-
                 @Test
                 @TestMetadata("interfaceCompanion_LL13_18.kt")
                 public void testInterfaceCompanion_LL13_18() throws Exception {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
index f810a018eaf..c2f0f0d87fd 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
@@ -2569,12 +2569,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
                     runTest("compiler/testData/diagnostics/tests/annotations/repeatable/javaRepeatableInKotlin.kt");
                 }
 
-                @Test
-                @TestMetadata("javaRepeatableJvmTarget6.kt")
-                public void testJavaRepeatableJvmTarget6() throws Exception {
-                    runTest("compiler/testData/diagnostics/tests/annotations/repeatable/javaRepeatableJvmTarget6.kt");
-                }
-
                 @Test
                 @TestMetadata("javaRepeatable_1_5.kt")
                 public void testJavaRepeatable_1_5() throws Exception {
@@ -36478,12 +36472,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
                         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithCompatibility"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
                     }
 
-                    @Test
-                    @TestMetadata("target6.kt")
-                    public void testTarget6() throws Exception {
-                        runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithCompatibility/target6.kt");
-                    }
-
                     @Test
                     @TestMetadata("target8.kt")
                     public void testTarget8() throws Exception {
@@ -36506,12 +36494,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
                         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithoutCompatibility"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
                     }
 
-                    @Test
-                    @TestMetadata("target6.kt")
-                    public void testTarget6() throws Exception {
-                        runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithoutCompatibility/target6.kt");
-                    }
-
                     @Test
                     @TestMetadata("target8.kt")
                     public void testTarget8() throws Exception {
@@ -36707,12 +36689,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
                     runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL12.kt");
                 }
 
-                @Test
-                @TestMetadata("interfaceCompanion_LL13_16.kt")
-                public void testInterfaceCompanion_LL13_16() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_16.kt");
-                }
-
                 @Test
                 @TestMetadata("interfaceCompanion_LL13_18.kt")
                 public void testInterfaceCompanion_LL13_18() throws Exception {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
index 9949b2ed945..2a9da57ae75 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
@@ -2575,12 +2575,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
                     runTest("compiler/testData/diagnostics/tests/annotations/repeatable/javaRepeatableInKotlin.kt");
                 }
 
-                @Test
-                @TestMetadata("javaRepeatableJvmTarget6.kt")
-                public void testJavaRepeatableJvmTarget6() throws Exception {
-                    runTest("compiler/testData/diagnostics/tests/annotations/repeatable/javaRepeatableJvmTarget6.kt");
-                }
-
                 @Test
                 @TestMetadata("javaRepeatable_1_5.kt")
                 public void testJavaRepeatable_1_5() throws Exception {
@@ -36574,12 +36568,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
                         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithCompatibility"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
                     }
 
-                    @Test
-                    @TestMetadata("target6.kt")
-                    public void testTarget6() throws Exception {
-                        runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithCompatibility/target6.kt");
-                    }
-
                     @Test
                     @TestMetadata("target8.kt")
                     public void testTarget8() throws Exception {
@@ -36602,12 +36590,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
                         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithoutCompatibility"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
                     }
 
-                    @Test
-                    @TestMetadata("target6.kt")
-                    public void testTarget6() throws Exception {
-                        runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithoutCompatibility/target6.kt");
-                    }
-
                     @Test
                     @TestMetadata("target8.kt")
                     public void testTarget8() throws Exception {
@@ -36803,12 +36785,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
                     runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL12.kt");
                 }
 
-                @Test
-                @TestMetadata("interfaceCompanion_LL13_16.kt")
-                public void testInterfaceCompanion_LL13_16() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_16.kt");
-                }
-
                 @Test
                 @TestMetadata("interfaceCompanion_LL13_18.kt")
                 public void testInterfaceCompanion_LL13_18() throws Exception {
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
index 305f751187c..e7a6253abf8 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
@@ -413,12 +413,6 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
             runTest("compiler/testData/codegen/box/annotations/targetOnPrimaryCtorParameterMultiModule.kt");
         }
 
-        @Test
-        @TestMetadata("typeAnnotationOnJdk6.kt")
-        public void testTypeAnnotationOnJdk6() throws Exception {
-            runTest("compiler/testData/codegen/box/annotations/typeAnnotationOnJdk6.kt");
-        }
-
         @Test
         @TestMetadata("useTypeParameterAnnotationFromJava.kt")
         public void testUseTypeParameterAnnotationFromJava() throws Exception {
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeTextTestGenerated.java
index cd9a48ec29d..b7a4f226f3c 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeTextTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeTextTestGenerated.java
@@ -3422,12 +3422,6 @@ public class FirLightTreeBytecodeTextTestGenerated extends AbstractFirLightTreeB
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/hashCode"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
         }
 
-        @Test
-        @TestMetadata("hashCode_1_6.kt")
-        public void testHashCode_1_6() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/hashCode/hashCode_1_6.kt");
-        }
-
         @Test
         @TestMetadata("interfaceHashCode.kt")
         public void testInterfaceHashCode() throws Exception {
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
index 521b631f532..5508055755c 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
@@ -413,12 +413,6 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
             runTest("compiler/testData/codegen/box/annotations/targetOnPrimaryCtorParameterMultiModule.kt");
         }
 
-        @Test
-        @TestMetadata("typeAnnotationOnJdk6.kt")
-        public void testTypeAnnotationOnJdk6() throws Exception {
-            runTest("compiler/testData/codegen/box/annotations/typeAnnotationOnJdk6.kt");
-        }
-
         @Test
         @TestMetadata("useTypeParameterAnnotationFromJava.kt")
         public void testUseTypeParameterAnnotationFromJava() throws Exception {
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBytecodeTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBytecodeTextTestGenerated.java
index 75b297b4828..2b6c2960e80 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBytecodeTextTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBytecodeTextTestGenerated.java
@@ -3422,12 +3422,6 @@ public class FirPsiBytecodeTextTestGenerated extends AbstractFirPsiBytecodeTextT
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/hashCode"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
         }
 
-        @Test
-        @TestMetadata("hashCode_1_6.kt")
-        public void testHashCode_1_6() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/hashCode/hashCode_1_6.kt");
-        }
-
         @Test
         @TestMetadata("interfaceHashCode.kt")
         public void testInterfaceHashCode() throws Exception {
diff --git a/compiler/testData/cli/jvm/jvmDefaultAll.args b/compiler/testData/cli/jvm/jvmDefaultAll.args
deleted file mode 100644
index a7c934a1c3c..00000000000
--- a/compiler/testData/cli/jvm/jvmDefaultAll.args
+++ /dev/null
@@ -1,6 +0,0 @@
-$TESTDATA_DIR$/jvmDefaultAll.kt
--d
-$TEMP_DIR$
--jvm-target
-1.6
--Xjvm-default=all
diff --git a/compiler/testData/cli/jvm/jvmDefaultAll.kt b/compiler/testData/cli/jvm/jvmDefaultAll.kt
deleted file mode 100644
index 1f5c7ebed50..00000000000
--- a/compiler/testData/cli/jvm/jvmDefaultAll.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-interface Foo {
-    fun test() {}
-}
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/jvmDefaultAll.out b/compiler/testData/cli/jvm/jvmDefaultAll.out
deleted file mode 100644
index d3dd4a63a04..00000000000
--- a/compiler/testData/cli/jvm/jvmDefaultAll.out
+++ /dev/null
@@ -1,3 +0,0 @@
-error: JVM target 1.6 is no longer supported. Please migrate to JVM target 1.8 or above
-error: '-Xjvm-default=all' is only supported since JVM target 1.8. Recompile with '-jvm-target 1.8'
-COMPILATION_ERROR
diff --git a/compiler/testData/codegen/asmLike/typeAnnotations/typeParameter16.asm.txt b/compiler/testData/codegen/asmLike/typeAnnotations/typeParameter16.asm.txt
deleted file mode 100644
index 18840d0b35d..00000000000
--- a/compiler/testData/codegen/asmLike/typeAnnotations/typeParameter16.asm.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-public final class foo/Kotlin : java/lang/Object {
-    public void <init>()
-
-    <T:Ljava/lang/Object;>(TT;)TT;
-    public final java.lang.Object bar(java.lang.Object p)
-}
-
-public abstract interface foo/TypeParameterAnn : java/lang/Object, java/lang/annotation/Annotation {
-    public abstract java.lang.String name()
-}
diff --git a/compiler/testData/codegen/asmLike/typeAnnotations/typeParameter16.kt b/compiler/testData/codegen/asmLike/typeAnnotations/typeParameter16.kt
deleted file mode 100644
index 2c3939ab0fa..00000000000
--- a/compiler/testData/codegen/asmLike/typeAnnotations/typeParameter16.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-// RENDER_ANNOTATIONS
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.6
-package foo
-
-@Target(AnnotationTarget.TYPE_PARAMETER)
-annotation class TypeParameterAnn(val name: String)
-
-class Kotlin {
-
-    fun <@TypeParameterAnn("T") T> bar(p: T): T {
-        return p
-    }
-
-}
diff --git a/compiler/testData/codegen/box/annotations/typeAnnotationOnJdk6.kt b/compiler/testData/codegen/box/annotations/typeAnnotationOnJdk6.kt
deleted file mode 100644
index a0e7c53b5b0..00000000000
--- a/compiler/testData/codegen/box/annotations/typeAnnotationOnJdk6.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-// TARGET_BACKEND: JVM
-// WITH_STDLIB
-// JVM_TARGET: 1.6
-
-@Target(AnnotationTarget.TYPE)
-annotation class A
-
-fun box(): String {
-    A::class.java.declaredAnnotations.joinToString()
-    ExtensionFunctionType::class.java.declaredAnnotations.joinToString()
-    return "OK"
-}
diff --git a/compiler/testData/codegen/bytecodeText/hashCode/hashCode_1_6.kt b/compiler/testData/codegen/bytecodeText/hashCode/hashCode_1_6.kt
deleted file mode 100644
index 6bec2e9f0b0..00000000000
--- a/compiler/testData/codegen/bytecodeText/hashCode/hashCode_1_6.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-// JVM_TARGET: 1.6
-
-fun box(): String {
-    true.hashCode()
-    1.toByte().hashCode()
-    1.toChar().hashCode()
-    1.toShort().hashCode()
-    1.hashCode()
-    1L.hashCode()
-    1.0F.hashCode()
-    1.0.hashCode()
-    "".hashCode()
-
-    return "OK"
-}
-
-// 9 \.hashCode
-// 9 \.hashCode \(\)I
diff --git a/compiler/testData/diagnostics/tests/annotations/repeatable/javaRepeatableJvmTarget6.kt b/compiler/testData/diagnostics/tests/annotations/repeatable/javaRepeatableJvmTarget6.kt
deleted file mode 100644
index 458fd261893..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/repeatable/javaRepeatableJvmTarget6.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-// FIR_IDENTICAL
-// !LANGUAGE: +RepeatableAnnotations
-// !JVM_TARGET: 1.6
-// FULL_JDK
-// FILE: Runtime.java
-
-import java.lang.annotation.*;
-
-@Repeatable(Runtime.Container.class)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Runtime {
-    public @interface Container {
-        Runtime[] value();
-    }
-}
-
-// FILE: Clazz.java
-
-import java.lang.annotation.*;
-
-@Repeatable(Clazz.Container.class)
-@Retention(RetentionPolicy.CLASS)
-public @interface Clazz {
-    public @interface Container {
-        Clazz[] value();
-    }
-}
-
-// FILE: Source.java
-
-import java.lang.annotation.*;
-
-@Repeatable(Source.Container.class)
-@Retention(RetentionPolicy.SOURCE)
-public @interface Source {
-    public @interface Container {
-        Source[] value();
-    }
-}
-
-// FILE: usage.kt
-
-@Runtime <!REPEATED_ANNOTATION_TARGET6!>@Runtime<!>
-class UseRuntime
-
-@Clazz <!REPEATED_ANNOTATION_TARGET6!>@Clazz<!>
-class UseClazz
-
-@Source @Source
-class UseSource
diff --git a/compiler/testData/diagnostics/tests/annotations/repeatable/javaRepeatableJvmTarget6.txt b/compiler/testData/diagnostics/tests/annotations/repeatable/javaRepeatableJvmTarget6.txt
deleted file mode 100644
index 7c295b4f6cc..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/repeatable/javaRepeatableJvmTarget6.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-package
-
-@java.lang.annotation.Repeatable(value = Clazz.Container::class) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) public final annotation class Clazz : kotlin.Annotation {
-    public constructor Clazz()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    public final annotation class Container : kotlin.Annotation {
-        public constructor Container(/*0*/ vararg value: Clazz /*kotlin.Array<out Clazz>*/)
-        public final val value: kotlin.Array<Clazz>
-        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-}
-
-@java.lang.annotation.Repeatable(value = Runtime.Container::class) @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) public final annotation class Runtime : kotlin.Annotation {
-    public constructor Runtime()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    public final annotation class Container : kotlin.Annotation {
-        public constructor Container(/*0*/ vararg value: Runtime /*kotlin.Array<out Runtime>*/)
-        public final val value: kotlin.Array<Runtime>
-        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-}
-
-@java.lang.annotation.Repeatable(value = Source.Container::class) @kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) public final annotation class Source : kotlin.Annotation {
-    public constructor Source()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    public final annotation class Container : kotlin.Annotation {
-        public constructor Container(/*0*/ vararg value: Source /*kotlin.Array<out Source>*/)
-        public final val value: kotlin.Array<Source>
-        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-}
-
-@Clazz @Clazz public final class UseClazz {
-    public constructor UseClazz()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-@Runtime @Runtime public final class UseRuntime {
-    public constructor UseRuntime()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-@Source @Source public final class UseSource {
-    public constructor UseSource()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
diff --git a/compiler/testData/diagnostics/tests/j+k/defaultMethods.fir.kt b/compiler/testData/diagnostics/tests/j+k/defaultMethods.fir.kt
deleted file mode 100644
index 47a65f32951..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/defaultMethods.fir.kt
+++ /dev/null
@@ -1,167 +0,0 @@
-// !JVM_TARGET: 1.6
-// FILE: JavaInterface.java
-
-public interface JavaInterface {
-    static String testStatic() {
-        return "OK";
-    }
-
-    default String test() {
-        return "OK";
-    }
-
-    default String testOverride() {
-        return "OK";
-    }
-}
-
-// FILE: 1.kt
-import JavaInterface.testStatic
-
-interface KotlinInterface : JavaInterface {
-    fun fooo() {
-        <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
-        super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
-
-        object  {
-            fun run () {
-                super@KotlinInterface.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
-            }
-        }
-    }
-
-    val propertyy: String
-        get() {
-            super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
-
-            object  {
-                fun run () {
-                    super@KotlinInterface.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
-                }
-            }
-            return ""
-        }
-
-    override fun testOverride(): String {
-        return "OK";
-    }
-}
-
-interface KotlinInterfaceIndirectInheritance : KotlinInterface {
-    fun foooo() {
-        <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
-        super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
-
-        object  {
-            fun run () {
-                super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
-            }
-        }
-    }
-
-    val propertyyy: String
-        get() {
-            super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
-
-            object  {
-                fun run () {
-                    super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
-                }
-            }
-            return ""
-        }
-}
-
-open class KotlinClass : JavaInterface {
-    fun foo() {
-        <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
-        super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
-        super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testOverride<!>()
-
-        object  {
-            fun run () {
-                super@KotlinClass.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
-            }
-        }
-    }
-
-    val property: String
-        get() {
-            super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
-            super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testOverride<!>()
-
-            object  {
-                fun run () {
-                    super@KotlinClass.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
-                }
-            }
-            return ""
-        }
-}
-
-class KotlinClassIndirectInheritance : KotlinClass() {
-    fun foo2(){
-        <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
-        super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
-        super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testOverride<!>()
-
-        object  {
-            fun run () {
-                super@KotlinClassIndirectInheritance.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
-            }
-        }
-    }
-
-    val property2: String
-        get() {
-            super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
-            super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testOverride<!>()
-
-            object  {
-                fun run () {
-                    super@KotlinClassIndirectInheritance.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
-                }
-            }
-            return ""
-        }
-}
-
-class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
-    fun foo() {
-        <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
-        super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
-        super.testOverride()
-
-        object  {
-            fun run () {
-                super@KotlinClassIndirectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
-            }
-        }
-    }
-
-    val property: String
-        get() {
-            super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
-            super.testOverride()
-
-            object  {
-                fun run () {
-                    super@KotlinClassIndirectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
-                }
-            }
-            return ""
-        }
-}
-
-fun test() {
-    JavaInterface.<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
-    KotlinClass().foo()
-    KotlinClass().property
-    KotlinClassIndirectInheritance2().foo()
-    KotlinClassIndirectInheritance2().property
-
-    KotlinClass().test()
-    KotlinClass().property
-    KotlinClass().testOverride()
-    KotlinClassIndirectInheritance().testOverride()
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/defaultMethods.kt b/compiler/testData/diagnostics/tests/j+k/defaultMethods.kt
index dd18837b387..2c5f0919d24 100644
--- a/compiler/testData/diagnostics/tests/j+k/defaultMethods.kt
+++ b/compiler/testData/diagnostics/tests/j+k/defaultMethods.kt
@@ -1,4 +1,4 @@
-// !JVM_TARGET: 1.6
+// FIR_IDENTICAL
 // FILE: JavaInterface.java
 
 public interface JavaInterface {
@@ -20,7 +20,7 @@ import JavaInterface.testStatic
 
 interface KotlinInterface : JavaInterface {
     fun fooo() {
-        <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
+        testStatic()
         super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
 
         object  {
@@ -49,7 +49,7 @@ interface KotlinInterface : JavaInterface {
 
 interface KotlinInterfaceIndirectInheritance : KotlinInterface {
     fun foooo() {
-        <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
+        testStatic()
         super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
 
         object  {
@@ -74,25 +74,25 @@ interface KotlinInterfaceIndirectInheritance : KotlinInterface {
 
 open class KotlinClass : JavaInterface {
     fun foo() {
-        <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
-        super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
-        super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testOverride<!>()
+        testStatic()
+        super.test()
+        super.testOverride()
 
         object  {
             fun run () {
-                super@KotlinClass.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
+                super@KotlinClass.test()
             }
         }
     }
 
     val property: String
         get() {
-            super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
-            super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testOverride<!>()
+            super.test()
+            super.testOverride()
 
             object  {
                 fun run () {
-                    super@KotlinClass.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
+                    super@KotlinClass.test()
                 }
             }
             return ""
@@ -101,7 +101,7 @@ open class KotlinClass : JavaInterface {
 
 class KotlinClassIndirectInheritance : KotlinClass() {
     fun foo2(){
-        <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
+        testStatic()
         super.test()
         super.testOverride()
 
@@ -128,25 +128,25 @@ class KotlinClassIndirectInheritance : KotlinClass() {
 
 class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
     fun foo() {
-        <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
-        super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
+        testStatic()
+        super.test()
         super.testOverride()
 
         object  {
             fun run () {
-                super@KotlinClassIndirectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
+                super@KotlinClassIndirectInheritance2.test()
             }
         }
     }
 
     val property: String
         get() {
-            super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
+            super.test()
             super.testOverride()
 
             object  {
                 fun run () {
-                    super@KotlinClassIndirectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
+                    super@KotlinClassIndirectInheritance2.test()
                 }
             }
             return ""
@@ -154,7 +154,7 @@ class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
 }
 
 fun test() {
-    JavaInterface.<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
+    JavaInterface.testStatic()
     KotlinClass().foo()
     KotlinClass().property
     KotlinClassIndirectInheritance2().foo()
diff --git a/compiler/testData/diagnostics/tests/j+k/defaultMethodsIndirectInheritance.fir.kt b/compiler/testData/diagnostics/tests/j+k/defaultMethodsIndirectInheritance.fir.kt
deleted file mode 100644
index 1ecaa9ebc83..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/defaultMethodsIndirectInheritance.fir.kt
+++ /dev/null
@@ -1,80 +0,0 @@
-// !JVM_TARGET: 1.6
-// FILE: JavaInterfaceBase.java
-
-public interface JavaInterfaceBase {
-    default String test() {
-        return "OK";
-    }
-
-    default String testOverride() {
-        return "OK";
-    }
-}
-
-// FILE: JavaInterface.java
-
-public interface JavaInterface extends JavaInterfaceBase {
-    static String testStatic() {
-        return "OK";
-    }
-}
-
-
-// FILE: 1.kt
-import JavaInterface.testStatic
-
-interface KotlinInterface : JavaInterface {
-    fun fooo() {
-        <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
-        super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
-        test()
-        testOverride()
-    }
-
-    override fun testOverride(): String {
-        return "OK";
-    }
-}
-
-interface KotlinInterfaceIndirectInheritance : KotlinInterface {
-    fun foooo() {
-        <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
-        super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
-        testOverride()
-        super.testOverride()
-    }
-}
-
-open class KotlinClass : JavaInterface {
-    fun foo(){
-        <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
-        super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
-        super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testOverride<!>()
-    }
-}
-
-class KotlinClassIndirectInheritance : KotlinClass() {
-    fun foo2(){
-        <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
-        super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
-        super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testOverride<!>()
-    }
-}
-
-class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
-    fun foo(){
-        <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
-        super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
-        super.testOverride()
-    }
-}
-
-fun test() {
-    JavaInterface.<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
-    KotlinClass().foo()
-    KotlinClassIndirectInheritance2().foo()
-
-    KotlinClass().test()
-    KotlinClass().testOverride()
-    KotlinClassIndirectInheritance().testOverride()
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/defaultMethodsIndirectInheritance.kt b/compiler/testData/diagnostics/tests/j+k/defaultMethodsIndirectInheritance.kt
index d10532a2fd1..a7ea4340a6f 100644
--- a/compiler/testData/diagnostics/tests/j+k/defaultMethodsIndirectInheritance.kt
+++ b/compiler/testData/diagnostics/tests/j+k/defaultMethodsIndirectInheritance.kt
@@ -1,4 +1,4 @@
-// !JVM_TARGET: 1.6
+// FIR_IDENTICAL
 // FILE: JavaInterfaceBase.java
 
 public interface JavaInterfaceBase {
@@ -25,7 +25,7 @@ import JavaInterface.testStatic
 
 interface KotlinInterface : JavaInterface {
     fun fooo() {
-        <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
+        testStatic()
         super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
         test()
         testOverride()
@@ -38,7 +38,7 @@ interface KotlinInterface : JavaInterface {
 
 interface KotlinInterfaceIndirectInheritance : KotlinInterface {
     fun foooo() {
-        <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
+        testStatic()
         super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
         testOverride()
         super.testOverride()
@@ -47,15 +47,15 @@ interface KotlinInterfaceIndirectInheritance : KotlinInterface {
 
 open class KotlinClass : JavaInterface {
     fun foo(){
-        <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
-        super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
-        super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testOverride<!>()
+        testStatic()
+        super.test()
+        super.testOverride()
     }
 }
 
 class KotlinClassIndirectInheritance : KotlinClass() {
     fun foo2(){
-        <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
+        testStatic()
         super.test()
         super.testOverride()
     }
@@ -63,14 +63,14 @@ class KotlinClassIndirectInheritance : KotlinClass() {
 
 class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
     fun foo(){
-        <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
-        super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
+        testStatic()
+        super.test()
         super.testOverride()
     }
 }
 
 fun test() {
-    JavaInterface.<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
+    JavaInterface.testStatic()
     KotlinClass().foo()
     KotlinClassIndirectInheritance2().foo()
 
diff --git a/compiler/testData/diagnostics/tests/j+k/traitDefaultCall.kt b/compiler/testData/diagnostics/tests/j+k/traitDefaultCall.kt
index d036217cdd9..0374f85b4ff 100644
--- a/compiler/testData/diagnostics/tests/j+k/traitDefaultCall.kt
+++ b/compiler/testData/diagnostics/tests/j+k/traitDefaultCall.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !JVM_TARGET: 1.6
 // FILE: Test.java
 public interface Test {
     default String test() {
@@ -27,7 +26,7 @@ interface KTrait2 : KTrait {
 
 class A : KTrait {
     fun a() {
-        super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
+        super.test()
 
         test()
     }
@@ -36,7 +35,7 @@ class A : KTrait {
 
 class A2 : KTrait2 {
     fun a() {
-        super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
+        super.test()
 
         test()
     }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithCompatibility/target6.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithCompatibility/target6.kt
deleted file mode 100644
index f28be713b5b..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithCompatibility/target6.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-// FIR_IDENTICAL
-// !JVM_TARGET: 1.6
-
-<!JVM_DEFAULT_IN_JVM6_TARGET!>@JvmDefaultWithCompatibility<!>
-interface A {}
-
-<!JVM_DEFAULT_IN_JVM6_TARGET!>@JvmDefaultWithCompatibility<!>
-class B : A {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithCompatibility/target6.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithCompatibility/target6.txt
deleted file mode 100644
index 96c129026cf..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithCompatibility/target6.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-package
-
-@kotlin.jvm.JvmDefaultWithCompatibility public interface A {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-@kotlin.jvm.JvmDefaultWithCompatibility public final class B : A {
-    public constructor B()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithoutCompatibility/target6.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithoutCompatibility/target6.kt
deleted file mode 100644
index ddeb1611c04..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithoutCompatibility/target6.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-// FIR_IDENTICAL
-// !JVM_TARGET: 1.6
-
-<!JVM_DEFAULT_IN_JVM6_TARGET!>@JvmDefaultWithoutCompatibility<!>
-interface A {}
-
-<!JVM_DEFAULT_IN_JVM6_TARGET!>@JvmDefaultWithoutCompatibility<!>
-class B : A {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithoutCompatibility/target6.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithoutCompatibility/target6.txt
deleted file mode 100644
index 411882813db..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithoutCompatibility/target6.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-package
-
-@kotlin.jvm.JvmDefaultWithoutCompatibility public interface A {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-@kotlin.jvm.JvmDefaultWithoutCompatibility public final class B : A {
-    public constructor B()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_16.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_16.fir.kt
deleted file mode 100644
index 63f1ee5e26e..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_16.fir.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_VARIABLE
-// !LANGUAGE: +JvmStaticInInterface
-// !JVM_TARGET: 1.6
-
-interface B {
-    companion object {
-        @JvmStatic fun a1() {
-
-        }
-
-        <!JVM_STATIC_ON_NON_PUBLIC_MEMBER!>@JvmStatic private fun a2()<!> {
-
-        }
-
-        <!JVM_STATIC_ON_NON_PUBLIC_MEMBER!>@JvmStatic protected fun a3()<!> {
-
-        }
-
-        <!JVM_STATIC_ON_NON_PUBLIC_MEMBER!>@JvmStatic internal fun a4()<!> {
-
-        }
-
-        <!JVM_STATIC_ON_EXTERNAL_IN_INTERFACE!>@JvmStatic external fun a5()<!>
-
-        @JvmStatic
-        var foo = 1
-
-        <!JVM_STATIC_ON_NON_PUBLIC_MEMBER!>@JvmStatic
-        var foo1<!> = 1
-            protected set
-
-        <!JVM_STATIC_ON_NON_PUBLIC_MEMBER!>@JvmStatic
-        var foo2<!> = 1
-            private set
-
-        <!JVM_STATIC_ON_NON_PUBLIC_MEMBER!>@JvmStatic
-        private var foo3<!> = 1
-
-        <!JVM_STATIC_ON_NON_PUBLIC_MEMBER!>@JvmStatic
-        protected var foo4<!> = 1
-
-        <!JVM_STATIC_ON_NON_PUBLIC_MEMBER!>@JvmStatic
-        protected var foo5<!> = 1
-
-        @JvmStatic
-        val foo6 = 1
-
-        val foo7 = 1
-        @JvmStatic get
-
-        private var foo8 = 1
-        @JvmStatic <!SETTER_VISIBILITY_INCONSISTENT_WITH_PROPERTY_VISIBILITY!>public<!> set
-
-        public var foo9 = 1
-        <!JVM_STATIC_ON_NON_PUBLIC_MEMBER!>@JvmStatic private set<!>
-
-        <!JVM_STATIC_ON_EXTERNAL_IN_INTERFACE!>@JvmStatic
-        val foo10: Int<!> external get
-
-        val foo11: Int <!JVM_STATIC_ON_EXTERNAL_IN_INTERFACE!>@JvmStatic external get<!>
-    }
-
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_16.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_16.kt
deleted file mode 100644
index 64349cf25d8..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_16.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_VARIABLE
-// !LANGUAGE: +JvmStaticInInterface
-// !JVM_TARGET: 1.6
-
-interface B {
-    companion object {
-        <!JVM_STATIC_IN_INTERFACE_1_6!>@JvmStatic fun a1()<!> {
-
-        }
-
-        <!JVM_STATIC_IN_INTERFACE_1_6, JVM_STATIC_ON_NON_PUBLIC_MEMBER!>@JvmStatic private fun a2()<!> {
-
-        }
-
-        <!JVM_STATIC_IN_INTERFACE_1_6, JVM_STATIC_ON_NON_PUBLIC_MEMBER!>@JvmStatic protected fun a3()<!> {
-
-        }
-
-        <!JVM_STATIC_IN_INTERFACE_1_6, JVM_STATIC_ON_NON_PUBLIC_MEMBER!>@JvmStatic internal fun a4()<!> {
-
-        }
-
-        <!JVM_STATIC_IN_INTERFACE_1_6, JVM_STATIC_ON_EXTERNAL_IN_INTERFACE!>@JvmStatic external fun a5()<!>
-
-        <!JVM_STATIC_IN_INTERFACE_1_6!>@JvmStatic
-        var foo<!> = 1
-
-        <!JVM_STATIC_IN_INTERFACE_1_6, JVM_STATIC_ON_NON_PUBLIC_MEMBER!>@JvmStatic
-        var foo1<!> = 1
-            protected set
-
-        <!JVM_STATIC_IN_INTERFACE_1_6, JVM_STATIC_ON_NON_PUBLIC_MEMBER!>@JvmStatic
-        var foo2<!> = 1
-            private set
-
-        <!JVM_STATIC_IN_INTERFACE_1_6, JVM_STATIC_ON_NON_PUBLIC_MEMBER!>@JvmStatic
-        private var foo3<!> = 1
-
-        <!JVM_STATIC_IN_INTERFACE_1_6, JVM_STATIC_ON_NON_PUBLIC_MEMBER!>@JvmStatic
-        protected var foo4<!> = 1
-
-        <!JVM_STATIC_IN_INTERFACE_1_6, JVM_STATIC_ON_NON_PUBLIC_MEMBER!>@JvmStatic
-        protected var foo5<!> = 1
-
-        <!JVM_STATIC_IN_INTERFACE_1_6!>@JvmStatic
-        val foo6<!> = 1
-
-        val foo7 = 1
-        <!JVM_STATIC_IN_INTERFACE_1_6!>@JvmStatic get<!>
-
-        private var foo8 = 1
-        <!JVM_STATIC_IN_INTERFACE_1_6!><!ANNOTATION_TARGETS_NON_EXISTENT_ACCESSOR!>@JvmStatic<!> <!SETTER_VISIBILITY_INCONSISTENT_WITH_PROPERTY_VISIBILITY!>public<!> set<!>
-
-        public var foo9 = 1
-        <!JVM_STATIC_IN_INTERFACE_1_6, JVM_STATIC_ON_NON_PUBLIC_MEMBER!>@JvmStatic private set<!>
-
-        <!JVM_STATIC_IN_INTERFACE_1_6, JVM_STATIC_ON_EXTERNAL_IN_INTERFACE!>@JvmStatic
-        val foo10: Int<!> external get
-
-        val foo11: Int <!JVM_STATIC_IN_INTERFACE_1_6, JVM_STATIC_ON_EXTERNAL_IN_INTERFACE!>@JvmStatic external get<!>
-    }
-
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_16.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_16.txt
deleted file mode 100644
index 86a98c44c1f..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_16.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-package
-
-public interface B {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    public companion object Companion {
-        private constructor Companion()
-        @kotlin.jvm.JvmStatic public final var foo: kotlin.Int
-        @kotlin.jvm.JvmStatic public final var foo1: kotlin.Int
-        @kotlin.jvm.JvmStatic public final val foo10: kotlin.Int
-        @get:kotlin.jvm.JvmStatic public final val foo11: kotlin.Int
-        @kotlin.jvm.JvmStatic public final var foo2: kotlin.Int
-        @kotlin.jvm.JvmStatic private final var foo3: kotlin.Int
-        @kotlin.jvm.JvmStatic protected final var foo4: kotlin.Int
-        @kotlin.jvm.JvmStatic protected final var foo5: kotlin.Int
-        @kotlin.jvm.JvmStatic public final val foo6: kotlin.Int = 1
-        @get:kotlin.jvm.JvmStatic public final val foo7: kotlin.Int = 1
-        @set:kotlin.jvm.JvmStatic private final var foo8: kotlin.Int
-        @set:kotlin.jvm.JvmStatic public final var foo9: kotlin.Int
-        @kotlin.jvm.JvmStatic public final fun a1(): kotlin.Unit
-        @kotlin.jvm.JvmStatic private final fun a2(): kotlin.Unit
-        @kotlin.jvm.JvmStatic protected final fun a3(): kotlin.Unit
-        @kotlin.jvm.JvmStatic internal final fun a4(): kotlin.Unit
-        @kotlin.jvm.JvmStatic public final external fun a5(): kotlin.Unit
-        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-}
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
index 9c8f6df2e67..3ec1e08d26e 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
@@ -2575,12 +2575,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                     runTest("compiler/testData/diagnostics/tests/annotations/repeatable/javaRepeatableInKotlin.kt");
                 }
 
-                @Test
-                @TestMetadata("javaRepeatableJvmTarget6.kt")
-                public void testJavaRepeatableJvmTarget6() throws Exception {
-                    runTest("compiler/testData/diagnostics/tests/annotations/repeatable/javaRepeatableJvmTarget6.kt");
-                }
-
                 @Test
                 @TestMetadata("javaRepeatable_1_5.kt")
                 public void testJavaRepeatable_1_5() throws Exception {
@@ -37346,12 +37340,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithCompatibility"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
                     }
 
-                    @Test
-                    @TestMetadata("target6.kt")
-                    public void testTarget6() throws Exception {
-                        runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithCompatibility/target6.kt");
-                    }
-
                     @Test
                     @TestMetadata("target8.kt")
                     public void testTarget8() throws Exception {
@@ -37374,12 +37362,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithoutCompatibility"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
                     }
 
-                    @Test
-                    @TestMetadata("target6.kt")
-                    public void testTarget6() throws Exception {
-                        runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultWithoutCompatibility/target6.kt");
-                    }
-
                     @Test
                     @TestMetadata("target8.kt")
                     public void testTarget8() throws Exception {
@@ -37575,12 +37557,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                     runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL12.kt");
                 }
 
-                @Test
-                @TestMetadata("interfaceCompanion_LL13_16.kt")
-                public void testInterfaceCompanion_LL13_16() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_16.kt");
-                }
-
                 @Test
                 @TestMetadata("interfaceCompanion_LL13_18.kt")
                 public void testInterfaceCompanion_LL13_18() throws Exception {
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/AsmLikeInstructionListingTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/AsmLikeInstructionListingTestGenerated.java
index 134e4d98df8..ef419d8dd55 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/AsmLikeInstructionListingTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/AsmLikeInstructionListingTestGenerated.java
@@ -211,11 +211,5 @@ public class AsmLikeInstructionListingTestGenerated extends AbstractAsmLikeInstr
         public void testSyntheticAccessors() throws Exception {
             runTest("compiler/testData/codegen/asmLike/typeAnnotations/syntheticAccessors.kt");
         }
-
-        @Test
-        @TestMetadata("typeParameter16.kt")
-        public void testTypeParameter16() throws Exception {
-            runTest("compiler/testData/codegen/asmLike/typeAnnotations/typeParameter16.kt");
-        }
     }
 }
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
index cd85b3bd884..d764dd0723f 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
@@ -347,12 +347,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/annotations/syntheticMethodForProperty.kt");
         }
 
-        @Test
-        @TestMetadata("typeAnnotationOnJdk6.kt")
-        public void testTypeAnnotationOnJdk6() throws Exception {
-            runTest("compiler/testData/codegen/box/annotations/typeAnnotationOnJdk6.kt");
-        }
-
         @Test
         @TestMetadata("useTypeParameterAnnotationFromJava.kt")
         public void testUseTypeParameterAnnotationFromJava() throws Exception {
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeTextTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeTextTestGenerated.java
index 7029e8a05e3..3441f41c410 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeTextTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeTextTestGenerated.java
@@ -3098,12 +3098,6 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/hashCode"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
         }
 
-        @Test
-        @TestMetadata("hashCode_1_6.kt")
-        public void testHashCode_1_6() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/hashCode/hashCode_1_6.kt");
-        }
-
         @Test
         @TestMetadata("interfaceHashCode.kt")
         public void testInterfaceHashCode() throws Exception {
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrAsmLikeInstructionListingTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrAsmLikeInstructionListingTestGenerated.java
index 7c0c3ae8fcf..9c0ac507883 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrAsmLikeInstructionListingTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrAsmLikeInstructionListingTestGenerated.java
@@ -235,11 +235,5 @@ public class IrAsmLikeInstructionListingTestGenerated extends AbstractIrAsmLikeI
         public void testTypeParameter() throws Exception {
             runTest("compiler/testData/codegen/asmLike/typeAnnotations/typeParameter.kt");
         }
-
-        @Test
-        @TestMetadata("typeParameter16.kt")
-        public void testTypeParameter16() throws Exception {
-            runTest("compiler/testData/codegen/asmLike/typeAnnotations/typeParameter16.kt");
-        }
     }
 }
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
index 7bdf5b624fd..9b4071ded14 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
@@ -413,12 +413,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/annotations/targetOnPrimaryCtorParameterMultiModule.kt");
         }
 
-        @Test
-        @TestMetadata("typeAnnotationOnJdk6.kt")
-        public void testTypeAnnotationOnJdk6() throws Exception {
-            runTest("compiler/testData/codegen/box/annotations/typeAnnotationOnJdk6.kt");
-        }
-
         @Test
         @TestMetadata("useTypeParameterAnnotationFromJava.kt")
         public void testUseTypeParameterAnnotationFromJava() throws Exception {
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
index 08b22a70244..5667ba705f3 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
@@ -413,12 +413,6 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
             runTest("compiler/testData/codegen/box/annotations/targetOnPrimaryCtorParameterMultiModule.kt");
         }
 
-        @Test
-        @TestMetadata("typeAnnotationOnJdk6.kt")
-        public void testTypeAnnotationOnJdk6() throws Exception {
-            runTest("compiler/testData/codegen/box/annotations/typeAnnotationOnJdk6.kt");
-        }
-
         @Test
         @TestMetadata("useTypeParameterAnnotationFromJava.kt")
         public void testUseTypeParameterAnnotationFromJava() throws Exception {
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java
index 29dae45e039..7166349dbb7 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java
@@ -3422,12 +3422,6 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest {
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/hashCode"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
         }
 
-        @Test
-        @TestMetadata("hashCode_1_6.kt")
-        public void testHashCode_1_6() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/hashCode/hashCode_1_6.kt");
-        }
-
         @Test
         @TestMetadata("interfaceHashCode.kt")
         public void testInterfaceHashCode() throws Exception {
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java
index 53fd79e3a73..0876eafa7dd 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java
@@ -835,11 +835,6 @@ public class CliTestGenerated extends AbstractCliTest {
             runTest("compiler/testData/cli/jvm/jvm8Target.args");
         }
 
-        @TestMetadata("jvmDefaultAll.args")
-        public void testJvmDefaultAll() throws Exception {
-            runTest("compiler/testData/cli/jvm/jvmDefaultAll.args");
-        }
-
         @TestMetadata("jvmDefaultIncorrectValue.args")
         public void testJvmDefaultIncorrectValue() throws Exception {
             runTest("compiler/testData/cli/jvm/jvmDefaultIncorrectValue.args");
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
index 6ab9702b2ad..8cf7b230ab2 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
@@ -303,11 +303,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/annotations/syntheticMethodForProperty.kt");
         }
 
-        @TestMetadata("typeAnnotationOnJdk6.kt")
-        public void testTypeAnnotationOnJdk6() throws Exception {
-            runTest("compiler/testData/codegen/box/annotations/typeAnnotationOnJdk6.kt");
-        }
-
         @TestMetadata("useTypeParameterAnnotationFromJava.kt")
         public void testUseTypeParameterAnnotationFromJava() throws Exception {
             runTest("compiler/testData/codegen/box/annotations/useTypeParameterAnnotationFromJava.kt");