diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.fir.kt
index a446bc18b3b..e9111508af6 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.fir.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.fir.kt
@@ -1,4 +1,5 @@
 // JSPECIFY_STATE: strict
+// MUTE_FOR_PSI_CLASS_FILES_READING
 
 // FILE: AnnotatedBoundsOfWildcard.java
 import org.jspecify.nullness.*;
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.kt
index 6454fe49b75..f80dfcab859 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.kt
@@ -1,4 +1,5 @@
 // JSPECIFY_STATE: strict
+// MUTE_FOR_PSI_CLASS_FILES_READING
 
 // FILE: AnnotatedBoundsOfWildcard.java
 import org.jspecify.nullness.*;
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NonPlatformTypeParameter.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NonPlatformTypeParameter.fir.kt
index 3900d6f6428..d791994320c 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NonPlatformTypeParameter.fir.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NonPlatformTypeParameter.fir.kt
@@ -1,5 +1,6 @@
 // !LANGUAGE: +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
 // JSPECIFY_STATE: strict
+// MUTE_FOR_PSI_CLASS_FILES_READING
 
 // FILE: NonPlatformTypeParameter.java
 import org.jspecify.nullness.*;
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NonPlatformTypeParameter.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NonPlatformTypeParameter.kt
index 3900d6f6428..d791994320c 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NonPlatformTypeParameter.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NonPlatformTypeParameter.kt
@@ -1,5 +1,6 @@
 // !LANGUAGE: +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
 // JSPECIFY_STATE: strict
+// MUTE_FOR_PSI_CLASS_FILES_READING
 
 // FILE: NonPlatformTypeParameter.java
 import org.jspecify.nullness.*;
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.fir.kt
index 9c1ac210ab8..b810f57abdf 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.fir.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.fir.kt
@@ -1,4 +1,5 @@
 // JSPECIFY_STATE: strict
+// MUTE_FOR_PSI_CLASS_FILES_READING
 
 // FILE: TypeArgumentsFromParameterBounds.java
 import org.jspecify.nullness.*;
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.kt
index 95da98f4ea7..9ba6e0d974c 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.kt
@@ -1,4 +1,5 @@
 // JSPECIFY_STATE: strict
+// MUTE_FOR_PSI_CLASS_FILES_READING
 
 // FILE: TypeArgumentsFromParameterBounds.java
 import org.jspecify.nullness.*;
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.fir.kt
index aeff6ee6245..796d01a8bcb 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.fir.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.fir.kt
@@ -1,4 +1,5 @@
 // JSPECIFY_STATE: strict
+// MUTE_FOR_PSI_CLASS_FILES_READING
 
 // FILE: WildcardsWithDefault.java
 import org.jspecify.nullness.*;
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.kt
index aeff6ee6245..796d01a8bcb 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.kt
@@ -1,4 +1,5 @@
 // JSPECIFY_STATE: strict
+// MUTE_FOR_PSI_CLASS_FILES_READING
 
 // FILE: WildcardsWithDefault.java
 import org.jspecify.nullness.*;
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.fir.kt
index d830e654c04..0f6a58b00de 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.fir.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.fir.kt
@@ -1,3 +1,5 @@
+// MUTE_FOR_PSI_CLASS_FILES_READING
+
 // FILE: AnnotatedBoundsOfWildcard.java
 import org.jspecify.nullness.*;
 
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.kt
index d830e654c04..0f6a58b00de 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.kt
@@ -1,3 +1,5 @@
+// MUTE_FOR_PSI_CLASS_FILES_READING
+
 // FILE: AnnotatedBoundsOfWildcard.java
 import org.jspecify.nullness.*;
 
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.fir.kt
index c9a06d657be..fd7d5cd5092 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.fir.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.fir.kt
@@ -1,4 +1,6 @@
 // !LANGUAGE: +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
+// MUTE_FOR_PSI_CLASS_FILES_READING
+
 // FILE: NonPlatformTypeParameter.java
 import org.jspecify.nullness.*;
 
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.kt
index c9a06d657be..fd7d5cd5092 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.kt
@@ -1,4 +1,6 @@
 // !LANGUAGE: +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
+// MUTE_FOR_PSI_CLASS_FILES_READING
+
 // FILE: NonPlatformTypeParameter.java
 import org.jspecify.nullness.*;
 
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.fir.kt
index a888731c574..650c10d283b 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.fir.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.fir.kt
@@ -1,3 +1,5 @@
+// MUTE_FOR_PSI_CLASS_FILES_READING
+
 // FILE: TypeArgumentsFromParameterBounds.java
 import org.jspecify.nullness.*;
 
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.kt
index a888731c574..650c10d283b 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.kt
@@ -1,3 +1,5 @@
+// MUTE_FOR_PSI_CLASS_FILES_READING
+
 // FILE: TypeArgumentsFromParameterBounds.java
 import org.jspecify.nullness.*;
 
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/WildcardsWithDefault.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/WildcardsWithDefault.fir.kt
index 428c04b9fc4..82caaa15da3 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/WildcardsWithDefault.fir.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/WildcardsWithDefault.fir.kt
@@ -1,3 +1,5 @@
+// MUTE_FOR_PSI_CLASS_FILES_READING
+
 // FILE: WildcardsWithDefault.java
 import org.jspecify.nullness.*;
 
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/WildcardsWithDefault.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/WildcardsWithDefault.kt
index 428c04b9fc4..82caaa15da3 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/WildcardsWithDefault.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/WildcardsWithDefault.kt
@@ -1,3 +1,5 @@
+// MUTE_FOR_PSI_CLASS_FILES_READING
+
 // FILE: WildcardsWithDefault.java
 import org.jspecify.nullness.*;
 
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/annotatedTypeArguments.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/annotatedTypeArguments.fir.kt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/annotatedTypeArguments.fir.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/annotatedTypeArguments.fir.kt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/annotatedTypeArguments.fir.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/annotatedTypeArguments.fir.txt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/annotatedTypeArguments.fir.txt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/annotatedTypeArguments.fir.txt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/annotatedTypeArguments.javac.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/annotatedTypeArguments.javac.txt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/annotatedTypeArguments.javac.txt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/annotatedTypeArguments.javac.txt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/annotatedTypeArguments.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/annotatedTypeArguments.kt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/annotatedTypeArguments.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/annotatedTypeArguments.kt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/annotatedTypeArguments.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/annotatedTypeArguments.txt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/annotatedTypeArguments.txt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/annotatedTypeArguments.txt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBound.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBound.fir.kt
similarity index 96%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBound.fir.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBound.fir.kt
index b76c1edd98f..05862c5d66e 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBound.fir.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBound.fir.kt
@@ -1,9 +1,9 @@
 // !LANGUAGE: +TypeEnhancementImprovementsInStrictMode +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 // SKIP_TXT
+// MUTE_FOR_PSI_CLASS_FILES_READING
 
 // FILE: ClassTypeParameterBound.java
-// INCLUDE_JAVA_AS_BINARY
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBound.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBound.kt
similarity index 96%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBound.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBound.kt
index b76c1edd98f..05862c5d66e 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBound.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBound.kt
@@ -1,9 +1,9 @@
 // !LANGUAGE: +TypeEnhancementImprovementsInStrictMode +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 // SKIP_TXT
+// MUTE_FOR_PSI_CLASS_FILES_READING
 
 // FILE: ClassTypeParameterBound.java
-// INCLUDE_JAVA_AS_BINARY
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBoundWithWarnings.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBoundWithWarnings.fir.kt
similarity index 96%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBoundWithWarnings.fir.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBoundWithWarnings.fir.kt
index ac9d2cb1105..c9e0356f022 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBoundWithWarnings.fir.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBoundWithWarnings.fir.kt
@@ -1,9 +1,9 @@
 // !LANGUAGE: +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 // SKIP_TXT
+// MUTE_FOR_PSI_CLASS_FILES_READING
 
 // FILE: ClassTypeParameterBoundWithWarnings.java
-// INCLUDE_JAVA_AS_BINARY
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBoundWithWarnings.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBoundWithWarnings.kt
similarity index 96%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBoundWithWarnings.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBoundWithWarnings.kt
index ac9d2cb1105..c9e0356f022 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBoundWithWarnings.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBoundWithWarnings.kt
@@ -1,9 +1,9 @@
 // !LANGUAGE: +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 // SKIP_TXT
+// MUTE_FOR_PSI_CLASS_FILES_READING
 
 // FILE: ClassTypeParameterBoundWithWarnings.java
-// INCLUDE_JAVA_AS_BINARY
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/methodWithTypeParameter.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.fir.kt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/methodWithTypeParameter.fir.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.fir.kt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/methodWithTypeParameter.fir.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.fir.txt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/methodWithTypeParameter.fir.txt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.fir.txt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/methodWithTypeParameter.javac.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.javac.txt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/methodWithTypeParameter.javac.txt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.javac.txt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/methodWithTypeParameter.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.kt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/methodWithTypeParameter.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.kt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/methodWithTypeParameter.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.txt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/methodWithTypeParameter.txt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.txt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/notNullVarargsOverrides.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/notNullVarargsOverrides.fir.kt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/notNullVarargsOverrides.fir.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/notNullVarargsOverrides.fir.kt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/notNullVarargsOverrides.fir.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/notNullVarargsOverrides.fir.txt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/notNullVarargsOverrides.fir.txt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/notNullVarargsOverrides.fir.txt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/notNullVarargsOverrides.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/notNullVarargsOverrides.kt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/notNullVarargsOverrides.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/notNullVarargsOverrides.kt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/notNullVarargsOverrides.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/notNullVarargsOverrides.txt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/notNullVarargsOverrides.txt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/notNullVarargsOverrides.txt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/nullableVarargsOverrides.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/nullableVarargsOverrides.fir.kt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/nullableVarargsOverrides.fir.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/nullableVarargsOverrides.fir.kt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/nullableVarargsOverrides.fir.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/nullableVarargsOverrides.fir.txt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/nullableVarargsOverrides.fir.txt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/nullableVarargsOverrides.fir.txt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/nullableVarargsOverrides.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/nullableVarargsOverrides.kt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/nullableVarargsOverrides.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/nullableVarargsOverrides.kt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/nullableVarargsOverrides.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/nullableVarargsOverrides.txt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/nullableVarargsOverrides.txt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/nullableVarargsOverrides.txt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnType.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnType.fir.kt
similarity index 98%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnType.fir.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnType.fir.kt
index 342a26b0ad9..067de1af171 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnType.fir.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnType.fir.kt
@@ -1,9 +1,9 @@
 // !LANGUAGE: +TypeEnhancementImprovementsInStrictMode +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // SKIP_TXT
+// MUTE_FOR_PSI_CLASS_FILES_READING
 
 // FILE: ReturnType.java
-// INCLUDE_JAVA_AS_BINARY
 
 import org.jetbrains.annotations.*;
 
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnType.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnType.kt
similarity index 99%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnType.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnType.kt
index f2facf7d2a2..99b8224a551 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnType.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnType.kt
@@ -1,9 +1,9 @@
 // !LANGUAGE: +TypeEnhancementImprovementsInStrictMode +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // SKIP_TXT
+// MUTE_FOR_PSI_CLASS_FILES_READING
 
 // FILE: ReturnType.java
-// INCLUDE_JAVA_AS_BINARY
 
 import org.jetbrains.annotations.*;
 
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeDifferentConstructor.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeDifferentConstructor.fir.kt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeDifferentConstructor.fir.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeDifferentConstructor.fir.kt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeDifferentConstructor.fir.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeDifferentConstructor.fir.txt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeDifferentConstructor.fir.txt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeDifferentConstructor.fir.txt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeDifferentConstructor.javac.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeDifferentConstructor.javac.txt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeDifferentConstructor.javac.txt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeDifferentConstructor.javac.txt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeDifferentConstructor.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeDifferentConstructor.kt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeDifferentConstructor.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeDifferentConstructor.kt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeDifferentConstructor.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeDifferentConstructor.txt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeDifferentConstructor.txt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeDifferentConstructor.txt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeOverrideInKotlin.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeOverrideInKotlin.fir.kt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeOverrideInKotlin.fir.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeOverrideInKotlin.fir.kt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeOverrideInKotlin.fir.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeOverrideInKotlin.fir.txt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeOverrideInKotlin.fir.txt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeOverrideInKotlin.fir.txt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeOverrideInKotlin.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeOverrideInKotlin.kt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeOverrideInKotlin.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeOverrideInKotlin.kt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeOverrideInKotlin.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeOverrideInKotlin.txt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeOverrideInKotlin.txt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeOverrideInKotlin.txt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnTypeWithWarnings.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeWithWarnings.fir.kt
similarity index 98%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnTypeWithWarnings.fir.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeWithWarnings.fir.kt
index 3ddf3de6953..f1b503501db 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnTypeWithWarnings.fir.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeWithWarnings.fir.kt
@@ -1,9 +1,9 @@
 // !LANGUAGE: +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // SKIP_TXT
+// MUTE_FOR_PSI_CLASS_FILES_READING
 
 // FILE: ReturnTypeWithWarnings.java
-// INCLUDE_JAVA_AS_BINARY
 
 import org.jetbrains.annotations.*;
 
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnTypeWithWarnings.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeWithWarnings.kt
similarity index 99%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnTypeWithWarnings.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeWithWarnings.kt
index 544c25af6dd..6f811337a1b 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnTypeWithWarnings.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeWithWarnings.kt
@@ -1,9 +1,9 @@
 // !LANGUAGE: +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // SKIP_TXT
+// MUTE_FOR_PSI_CLASS_FILES_READING
 
 // FILE: ReturnTypeWithWarnings.java
-// INCLUDE_JAVA_AS_BINARY
 
 import org.jetbrains.annotations.*;
 
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/simple.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/simple.fir.kt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/simple.fir.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/simple.fir.kt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/simple.fir.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/simple.fir.txt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/simple.fir.txt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/simple.fir.txt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/simple.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/simple.kt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/simple.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/simple.kt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/simple.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/simple.txt
similarity index 100%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/simple.txt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/simple.txt
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameter.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameter.fir.kt
similarity index 98%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameter.fir.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameter.fir.kt
index 4c974c79007..8b91487d8c7 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameter.fir.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameter.fir.kt
@@ -1,9 +1,9 @@
 // !LANGUAGE: +TypeEnhancementImprovementsInStrictMode +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
 // !DIAGNOSTICS: -UNUSED_PARAMETER -CAST_NEVER_SUCCEEDS
 // SKIP_TXT
+// MUTE_FOR_PSI_CLASS_FILES_READING
 
 // FILE: ValueParameter.java
-// INCLUDE_JAVA_AS_BINARY
 
 import org.jetbrains.annotations.*;
 
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameter.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameter.kt
similarity index 98%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameter.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameter.kt
index 4c974c79007..8b91487d8c7 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameter.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameter.kt
@@ -1,9 +1,9 @@
 // !LANGUAGE: +TypeEnhancementImprovementsInStrictMode +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
 // !DIAGNOSTICS: -UNUSED_PARAMETER -CAST_NEVER_SUCCEEDS
 // SKIP_TXT
+// MUTE_FOR_PSI_CLASS_FILES_READING
 
 // FILE: ValueParameter.java
-// INCLUDE_JAVA_AS_BINARY
 
 import org.jetbrains.annotations.*;
 
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameterWithWarnings.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameterWithWarnings.fir.kt
similarity index 98%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameterWithWarnings.fir.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameterWithWarnings.fir.kt
index 1a3ed2b3937..8d67fdd2c57 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameterWithWarnings.fir.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameterWithWarnings.fir.kt
@@ -1,9 +1,9 @@
 // !LANGUAGE: +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
 // !DIAGNOSTICS: -UNUSED_PARAMETER -CAST_NEVER_SUCCEEDS
 // SKIP_TXT
+// MUTE_FOR_PSI_CLASS_FILES_READING
 
 // FILE: ValueParameterWithWarnings.java
-// INCLUDE_JAVA_AS_BINARY
 
 import org.jetbrains.annotations.*;
 
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameterWithWarnings.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameterWithWarnings.kt
similarity index 98%
rename from compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameterWithWarnings.kt
rename to compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameterWithWarnings.kt
index 1a3ed2b3937..8d67fdd2c57 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameterWithWarnings.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameterWithWarnings.kt
@@ -1,9 +1,9 @@
 // !LANGUAGE: +ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
 // !DIAGNOSTICS: -UNUSED_PARAMETER -CAST_NEVER_SUCCEEDS
 // SKIP_TXT
+// MUTE_FOR_PSI_CLASS_FILES_READING
 
 // FILE: ValueParameterWithWarnings.java
-// INCLUDE_JAVA_AS_BINARY
 
 import org.jetbrains.annotations.*;
 
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaTestGenerated.java
index 928b3a3e852..3c76305d087 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaTestGenerated.java
@@ -875,188 +875,168 @@ public class ForeignAnnotationsCompiledJavaTestGenerated extends AbstractForeign
         }
 
         @Nested
-        @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement")
+        @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc")
         @TestDataPath("$PROJECT_ROOT")
-        public class TypeEnhancement {
+        public class Misc {
             @Test
-            public void testAllFilesPresentInTypeEnhancement() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            public void testAllFilesPresentInMisc() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc"), Pattern.compile("^(.+)\\.kt$"), null, true);
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled")
-            @TestDataPath("$PROJECT_ROOT")
-            public class OnCompiled {
-                @Test
-                public void testAllFilesPresentInOnCompiled() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled"), Pattern.compile("^(.+)\\.kt$"), null, true);
-                }
-
-                @Test
-                @TestMetadata("classTypeParameterBound.kt")
-                public void testClassTypeParameterBound() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBound.kt");
-                }
-
-                @Test
-                @TestMetadata("classTypeParameterBoundWithWarnings.kt")
-                public void testClassTypeParameterBoundWithWarnings() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBoundWithWarnings.kt");
-                }
-
-                @Test
-                @TestMetadata("classTypeParameterBoundWithWarnings.fir.kt")
-                public void testClassTypeParameterBoundWithWarnings_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBoundWithWarnings.fir.kt");
-                }
-
-                @Test
-                @TestMetadata("classTypeParameterBound.fir.kt")
-                public void testClassTypeParameterBound_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBound.fir.kt");
-                }
-
-                @Test
-                @TestMetadata("returnType.kt")
-                public void testReturnType() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnType.kt");
-                }
-
-                @Test
-                @TestMetadata("returnTypeWithWarnings.kt")
-                public void testReturnTypeWithWarnings() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnTypeWithWarnings.kt");
-                }
-
-                @Test
-                @TestMetadata("returnTypeWithWarnings.fir.kt")
-                public void testReturnTypeWithWarnings_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnTypeWithWarnings.fir.kt");
-                }
-
-                @Test
-                @TestMetadata("returnType.fir.kt")
-                public void testReturnType_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnType.fir.kt");
-                }
-
-                @Test
-                @TestMetadata("valueParameter.kt")
-                public void testValueParameter() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameter.kt");
-                }
-
-                @Test
-                @TestMetadata("valueParameterWithWarnings.kt")
-                public void testValueParameterWithWarnings() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameterWithWarnings.kt");
-                }
-
-                @Test
-                @TestMetadata("valueParameterWithWarnings.fir.kt")
-                public void testValueParameterWithWarnings_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameterWithWarnings.fir.kt");
-                }
-
-                @Test
-                @TestMetadata("valueParameter.fir.kt")
-                public void testValueParameter_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameter.fir.kt");
-                }
+            @Test
+            @TestMetadata("annotatedTypeArguments.kt")
+            public void testAnnotatedTypeArguments() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/annotatedTypeArguments.kt");
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources")
-            @TestDataPath("$PROJECT_ROOT")
-            public class OnSources {
-                @Test
-                public void testAllFilesPresentInOnSources() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources"), Pattern.compile("^(.+)\\.kt$"), null, true);
-                }
+            @Test
+            @TestMetadata("annotatedTypeArguments.fir.kt")
+            public void testAnnotatedTypeArguments_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/annotatedTypeArguments.fir.kt");
+            }
 
-                @Test
-                @TestMetadata("annotatedTypeArguments.kt")
-                public void testAnnotatedTypeArguments() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/annotatedTypeArguments.kt");
-                }
+            @Test
+            @TestMetadata("classTypeParameterBound.kt")
+            public void testClassTypeParameterBound() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBound.kt");
+            }
 
-                @Test
-                @TestMetadata("annotatedTypeArguments.fir.kt")
-                public void testAnnotatedTypeArguments_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/annotatedTypeArguments.fir.kt");
-                }
+            @Test
+            @TestMetadata("classTypeParameterBoundWithWarnings.kt")
+            public void testClassTypeParameterBoundWithWarnings() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBoundWithWarnings.kt");
+            }
 
-                @Test
-                @TestMetadata("methodWithTypeParameter.kt")
-                public void testMethodWithTypeParameter() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/methodWithTypeParameter.kt");
-                }
+            @Test
+            @TestMetadata("classTypeParameterBoundWithWarnings.fir.kt")
+            public void testClassTypeParameterBoundWithWarnings_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBoundWithWarnings.fir.kt");
+            }
 
-                @Test
-                @TestMetadata("methodWithTypeParameter.fir.kt")
-                public void testMethodWithTypeParameter_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/methodWithTypeParameter.fir.kt");
-                }
+            @Test
+            @TestMetadata("classTypeParameterBound.fir.kt")
+            public void testClassTypeParameterBound_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBound.fir.kt");
+            }
 
-                @Test
-                @TestMetadata("notNullVarargsOverrides.kt")
-                public void testNotNullVarargsOverrides() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/notNullVarargsOverrides.kt");
-                }
+            @Test
+            @TestMetadata("methodWithTypeParameter.kt")
+            public void testMethodWithTypeParameter() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.kt");
+            }
 
-                @Test
-                @TestMetadata("notNullVarargsOverrides.fir.kt")
-                public void testNotNullVarargsOverrides_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/notNullVarargsOverrides.fir.kt");
-                }
+            @Test
+            @TestMetadata("methodWithTypeParameter.fir.kt")
+            public void testMethodWithTypeParameter_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.fir.kt");
+            }
 
-                @Test
-                @TestMetadata("nullableVarargsOverrides.kt")
-                public void testNullableVarargsOverrides() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/nullableVarargsOverrides.kt");
-                }
+            @Test
+            @TestMetadata("notNullVarargsOverrides.kt")
+            public void testNotNullVarargsOverrides() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/notNullVarargsOverrides.kt");
+            }
 
-                @Test
-                @TestMetadata("nullableVarargsOverrides.fir.kt")
-                public void testNullableVarargsOverrides_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/nullableVarargsOverrides.fir.kt");
-                }
+            @Test
+            @TestMetadata("notNullVarargsOverrides.fir.kt")
+            public void testNotNullVarargsOverrides_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/notNullVarargsOverrides.fir.kt");
+            }
 
-                @Test
-                @TestMetadata("returnTypeDifferentConstructor.kt")
-                public void testReturnTypeDifferentConstructor() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeDifferentConstructor.kt");
-                }
+            @Test
+            @TestMetadata("nullableVarargsOverrides.kt")
+            public void testNullableVarargsOverrides() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/nullableVarargsOverrides.kt");
+            }
 
-                @Test
-                @TestMetadata("returnTypeDifferentConstructor.fir.kt")
-                public void testReturnTypeDifferentConstructor_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeDifferentConstructor.fir.kt");
-                }
+            @Test
+            @TestMetadata("nullableVarargsOverrides.fir.kt")
+            public void testNullableVarargsOverrides_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/nullableVarargsOverrides.fir.kt");
+            }
 
-                @Test
-                @TestMetadata("returnTypeOverrideInKotlin.kt")
-                public void testReturnTypeOverrideInKotlin() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeOverrideInKotlin.kt");
-                }
+            @Test
+            @TestMetadata("returnType.kt")
+            public void testReturnType() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnType.kt");
+            }
 
-                @Test
-                @TestMetadata("returnTypeOverrideInKotlin.fir.kt")
-                public void testReturnTypeOverrideInKotlin_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeOverrideInKotlin.fir.kt");
-                }
+            @Test
+            @TestMetadata("returnTypeDifferentConstructor.kt")
+            public void testReturnTypeDifferentConstructor() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeDifferentConstructor.kt");
+            }
 
-                @Test
-                @TestMetadata("simple.kt")
-                public void testSimple() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/simple.kt");
-                }
+            @Test
+            @TestMetadata("returnTypeDifferentConstructor.fir.kt")
+            public void testReturnTypeDifferentConstructor_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeDifferentConstructor.fir.kt");
+            }
 
-                @Test
-                @TestMetadata("simple.fir.kt")
-                public void testSimple_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/simple.fir.kt");
-                }
+            @Test
+            @TestMetadata("returnTypeOverrideInKotlin.kt")
+            public void testReturnTypeOverrideInKotlin() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeOverrideInKotlin.kt");
+            }
+
+            @Test
+            @TestMetadata("returnTypeOverrideInKotlin.fir.kt")
+            public void testReturnTypeOverrideInKotlin_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeOverrideInKotlin.fir.kt");
+            }
+
+            @Test
+            @TestMetadata("returnTypeWithWarnings.kt")
+            public void testReturnTypeWithWarnings() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeWithWarnings.kt");
+            }
+
+            @Test
+            @TestMetadata("returnTypeWithWarnings.fir.kt")
+            public void testReturnTypeWithWarnings_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeWithWarnings.fir.kt");
+            }
+
+            @Test
+            @TestMetadata("returnType.fir.kt")
+            public void testReturnType_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnType.fir.kt");
+            }
+
+            @Test
+            @TestMetadata("simple.kt")
+            public void testSimple() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/simple.kt");
+            }
+
+            @Test
+            @TestMetadata("simple.fir.kt")
+            public void testSimple_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/simple.fir.kt");
+            }
+
+            @Test
+            @TestMetadata("valueParameter.kt")
+            public void testValueParameter() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameter.kt");
+            }
+
+            @Test
+            @TestMetadata("valueParameterWithWarnings.kt")
+            public void testValueParameterWithWarnings() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameterWithWarnings.kt");
+            }
+
+            @Test
+            @TestMetadata("valueParameterWithWarnings.fir.kt")
+            public void testValueParameterWithWarnings_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameterWithWarnings.fir.kt");
+            }
+
+            @Test
+            @TestMetadata("valueParameter.fir.kt")
+            public void testValueParameter_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameter.fir.kt");
             }
         }
     }
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java
index 7529c2ea9e3..308e6465a9c 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java
@@ -543,7 +543,7 @@ public class ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated exte
     public class Java8Tests {
         @Test
         public void testAllFilesPresentInJava8Tests() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests"), Pattern.compile("^(.+)\\.kt$"), null, true, "jspecify", "typeEnhancement/onCompiled");
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests"), Pattern.compile("^(.+)\\.kt$"), null, true);
         }
 
         @Test
@@ -564,6 +564,276 @@ public class ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated exte
             runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeUseOnObject.kt");
         }
 
+        @Nested
+        @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify")
+        @TestDataPath("$PROJECT_ROOT")
+        public class Jspecify {
+            @Test
+            public void testAllFilesPresentInJspecify() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @Nested
+            @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode")
+            @TestDataPath("$PROJECT_ROOT")
+            public class StrictMode {
+                @Test
+                public void testAllFilesPresentInStrictMode() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                }
+
+                @Test
+                @TestMetadata("AnnotatedBoundsOfWildcard.kt")
+                public void testAnnotatedBoundsOfWildcard() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.kt");
+                }
+
+                @Test
+                @TestMetadata("AnnotatedBoundsOfWildcard.fir.kt")
+                public void testAnnotatedBoundsOfWildcard_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.fir.kt");
+                }
+
+                @Test
+                @TestMetadata("Defaults.kt")
+                public void testDefaults() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Defaults.kt");
+                }
+
+                @Test
+                @TestMetadata("Defaults.fir.kt")
+                public void testDefaults_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Defaults.fir.kt");
+                }
+
+                @Test
+                @TestMetadata("IgnoreAnnotations.kt")
+                public void testIgnoreAnnotations() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/IgnoreAnnotations.kt");
+                }
+
+                @Test
+                @TestMetadata("IgnoreAnnotations.fir.kt")
+                public void testIgnoreAnnotations_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/IgnoreAnnotations.fir.kt");
+                }
+
+                @Test
+                @TestMetadata("NonPlatformTypeParameter.kt")
+                public void testNonPlatformTypeParameter() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NonPlatformTypeParameter.kt");
+                }
+
+                @Test
+                @TestMetadata("NonPlatformTypeParameter.fir.kt")
+                public void testNonPlatformTypeParameter_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NonPlatformTypeParameter.fir.kt");
+                }
+
+                @Test
+                @TestMetadata("NullnessUnspecifiedTypeParameter.kt")
+                public void testNullnessUnspecifiedTypeParameter() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.kt");
+                }
+
+                @Test
+                @TestMetadata("NullnessUnspecifiedTypeParameter.fir.kt")
+                public void testNullnessUnspecifiedTypeParameter_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.fir.kt");
+                }
+
+                @Test
+                @TestMetadata("SelfType.kt")
+                public void testSelfType() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.kt");
+                }
+
+                @Test
+                @TestMetadata("SelfType.fir.kt")
+                public void testSelfType_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.fir.kt");
+                }
+
+                @Test
+                @TestMetadata("Simple.kt")
+                public void testSimple() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Simple.kt");
+                }
+
+                @Test
+                @TestMetadata("Simple.fir.kt")
+                public void testSimple_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Simple.fir.kt");
+                }
+
+                @Test
+                @TestMetadata("TypeArgumentsFromParameterBounds.kt")
+                public void testTypeArgumentsFromParameterBounds() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.kt");
+                }
+
+                @Test
+                @TestMetadata("TypeArgumentsFromParameterBounds.fir.kt")
+                public void testTypeArgumentsFromParameterBounds_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.fir.kt");
+                }
+
+                @Test
+                @TestMetadata("TypeParameterBounds.kt")
+                public void testTypeParameterBounds() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.kt");
+                }
+
+                @Test
+                @TestMetadata("TypeParameterBounds.fir.kt")
+                public void testTypeParameterBounds_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.fir.kt");
+                }
+
+                @Test
+                @TestMetadata("WildcardsWithDefault.kt")
+                public void testWildcardsWithDefault() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.kt");
+                }
+
+                @Test
+                @TestMetadata("WildcardsWithDefault.fir.kt")
+                public void testWildcardsWithDefault_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.fir.kt");
+                }
+            }
+
+            @Nested
+            @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode")
+            @TestDataPath("$PROJECT_ROOT")
+            public class WarnMode {
+                @Test
+                public void testAllFilesPresentInWarnMode() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                }
+
+                @Test
+                @TestMetadata("AnnotatedBoundsOfWildcard.kt")
+                public void testAnnotatedBoundsOfWildcard() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.kt");
+                }
+
+                @Test
+                @TestMetadata("AnnotatedBoundsOfWildcard.fir.kt")
+                public void testAnnotatedBoundsOfWildcard_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.fir.kt");
+                }
+
+                @Test
+                @TestMetadata("Defaults.kt")
+                public void testDefaults() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Defaults.kt");
+                }
+
+                @Test
+                @TestMetadata("Defaults.fir.kt")
+                public void testDefaults_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Defaults.fir.kt");
+                }
+
+                @Test
+                @TestMetadata("IgnoreAnnotations.kt")
+                public void testIgnoreAnnotations() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/IgnoreAnnotations.kt");
+                }
+
+                @Test
+                @TestMetadata("IgnoreAnnotations.fir.kt")
+                public void testIgnoreAnnotations_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/IgnoreAnnotations.fir.kt");
+                }
+
+                @Test
+                @TestMetadata("NonPlatformTypeParameter.kt")
+                public void testNonPlatformTypeParameter() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.kt");
+                }
+
+                @Test
+                @TestMetadata("NonPlatformTypeParameter.fir.kt")
+                public void testNonPlatformTypeParameter_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.fir.kt");
+                }
+
+                @Test
+                @TestMetadata("NullnessUnspecifiedTypeParameter.kt")
+                public void testNullnessUnspecifiedTypeParameter() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NullnessUnspecifiedTypeParameter.kt");
+                }
+
+                @Test
+                @TestMetadata("NullnessUnspecifiedTypeParameter.fir.kt")
+                public void testNullnessUnspecifiedTypeParameter_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NullnessUnspecifiedTypeParameter.fir.kt");
+                }
+
+                @Test
+                @TestMetadata("SelfType.kt")
+                public void testSelfType() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/SelfType.kt");
+                }
+
+                @Test
+                @TestMetadata("SelfType.fir.kt")
+                public void testSelfType_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/SelfType.fir.kt");
+                }
+
+                @Test
+                @TestMetadata("Simple.kt")
+                public void testSimple() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Simple.kt");
+                }
+
+                @Test
+                @TestMetadata("Simple.fir.kt")
+                public void testSimple_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Simple.fir.kt");
+                }
+
+                @Test
+                @TestMetadata("TypeArgumentsFromParameterBounds.kt")
+                public void testTypeArgumentsFromParameterBounds() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.kt");
+                }
+
+                @Test
+                @TestMetadata("TypeArgumentsFromParameterBounds.fir.kt")
+                public void testTypeArgumentsFromParameterBounds_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.fir.kt");
+                }
+
+                @Test
+                @TestMetadata("TypeParameterBounds.kt")
+                public void testTypeParameterBounds() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeParameterBounds.kt");
+                }
+
+                @Test
+                @TestMetadata("TypeParameterBounds.fir.kt")
+                public void testTypeParameterBounds_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeParameterBounds.fir.kt");
+                }
+
+                @Test
+                @TestMetadata("WildcardsWithDefault.kt")
+                public void testWildcardsWithDefault() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/WildcardsWithDefault.kt");
+                }
+
+                @Test
+                @TestMetadata("WildcardsWithDefault.fir.kt")
+                public void testWildcardsWithDefault_fir() throws Exception {
+                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/WildcardsWithDefault.fir.kt");
+                }
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305")
         @TestDataPath("$PROJECT_ROOT")
@@ -605,106 +875,168 @@ public class ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated exte
         }
 
         @Nested
-        @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement")
+        @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc")
         @TestDataPath("$PROJECT_ROOT")
-        public class TypeEnhancement {
+        public class Misc {
             @Test
-            public void testAllFilesPresentInTypeEnhancement() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement"), Pattern.compile("^(.+)\\.kt$"), null, true, "onCompiled");
+            public void testAllFilesPresentInMisc() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc"), Pattern.compile("^(.+)\\.kt$"), null, true);
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources")
-            @TestDataPath("$PROJECT_ROOT")
-            public class OnSources {
-                @Test
-                public void testAllFilesPresentInOnSources() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources"), Pattern.compile("^(.+)\\.kt$"), null, true);
-                }
+            @Test
+            @TestMetadata("annotatedTypeArguments.kt")
+            public void testAnnotatedTypeArguments() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/annotatedTypeArguments.kt");
+            }
 
-                @Test
-                @TestMetadata("annotatedTypeArguments.kt")
-                public void testAnnotatedTypeArguments() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/annotatedTypeArguments.kt");
-                }
+            @Test
+            @TestMetadata("annotatedTypeArguments.fir.kt")
+            public void testAnnotatedTypeArguments_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/annotatedTypeArguments.fir.kt");
+            }
 
-                @Test
-                @TestMetadata("annotatedTypeArguments.fir.kt")
-                public void testAnnotatedTypeArguments_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/annotatedTypeArguments.fir.kt");
-                }
+            @Test
+            @TestMetadata("classTypeParameterBound.kt")
+            public void testClassTypeParameterBound() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBound.kt");
+            }
 
-                @Test
-                @TestMetadata("methodWithTypeParameter.kt")
-                public void testMethodWithTypeParameter() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/methodWithTypeParameter.kt");
-                }
+            @Test
+            @TestMetadata("classTypeParameterBoundWithWarnings.kt")
+            public void testClassTypeParameterBoundWithWarnings() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBoundWithWarnings.kt");
+            }
 
-                @Test
-                @TestMetadata("methodWithTypeParameter.fir.kt")
-                public void testMethodWithTypeParameter_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/methodWithTypeParameter.fir.kt");
-                }
+            @Test
+            @TestMetadata("classTypeParameterBoundWithWarnings.fir.kt")
+            public void testClassTypeParameterBoundWithWarnings_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBoundWithWarnings.fir.kt");
+            }
 
-                @Test
-                @TestMetadata("notNullVarargsOverrides.kt")
-                public void testNotNullVarargsOverrides() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/notNullVarargsOverrides.kt");
-                }
+            @Test
+            @TestMetadata("classTypeParameterBound.fir.kt")
+            public void testClassTypeParameterBound_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBound.fir.kt");
+            }
 
-                @Test
-                @TestMetadata("notNullVarargsOverrides.fir.kt")
-                public void testNotNullVarargsOverrides_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/notNullVarargsOverrides.fir.kt");
-                }
+            @Test
+            @TestMetadata("methodWithTypeParameter.kt")
+            public void testMethodWithTypeParameter() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.kt");
+            }
 
-                @Test
-                @TestMetadata("nullableVarargsOverrides.kt")
-                public void testNullableVarargsOverrides() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/nullableVarargsOverrides.kt");
-                }
+            @Test
+            @TestMetadata("methodWithTypeParameter.fir.kt")
+            public void testMethodWithTypeParameter_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.fir.kt");
+            }
 
-                @Test
-                @TestMetadata("nullableVarargsOverrides.fir.kt")
-                public void testNullableVarargsOverrides_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/nullableVarargsOverrides.fir.kt");
-                }
+            @Test
+            @TestMetadata("notNullVarargsOverrides.kt")
+            public void testNotNullVarargsOverrides() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/notNullVarargsOverrides.kt");
+            }
 
-                @Test
-                @TestMetadata("returnTypeDifferentConstructor.kt")
-                public void testReturnTypeDifferentConstructor() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeDifferentConstructor.kt");
-                }
+            @Test
+            @TestMetadata("notNullVarargsOverrides.fir.kt")
+            public void testNotNullVarargsOverrides_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/notNullVarargsOverrides.fir.kt");
+            }
 
-                @Test
-                @TestMetadata("returnTypeDifferentConstructor.fir.kt")
-                public void testReturnTypeDifferentConstructor_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeDifferentConstructor.fir.kt");
-                }
+            @Test
+            @TestMetadata("nullableVarargsOverrides.kt")
+            public void testNullableVarargsOverrides() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/nullableVarargsOverrides.kt");
+            }
 
-                @Test
-                @TestMetadata("returnTypeOverrideInKotlin.kt")
-                public void testReturnTypeOverrideInKotlin() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeOverrideInKotlin.kt");
-                }
+            @Test
+            @TestMetadata("nullableVarargsOverrides.fir.kt")
+            public void testNullableVarargsOverrides_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/nullableVarargsOverrides.fir.kt");
+            }
 
-                @Test
-                @TestMetadata("returnTypeOverrideInKotlin.fir.kt")
-                public void testReturnTypeOverrideInKotlin_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeOverrideInKotlin.fir.kt");
-                }
+            @Test
+            @TestMetadata("returnType.kt")
+            public void testReturnType() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnType.kt");
+            }
 
-                @Test
-                @TestMetadata("simple.kt")
-                public void testSimple() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/simple.kt");
-                }
+            @Test
+            @TestMetadata("returnTypeDifferentConstructor.kt")
+            public void testReturnTypeDifferentConstructor() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeDifferentConstructor.kt");
+            }
 
-                @Test
-                @TestMetadata("simple.fir.kt")
-                public void testSimple_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/simple.fir.kt");
-                }
+            @Test
+            @TestMetadata("returnTypeDifferentConstructor.fir.kt")
+            public void testReturnTypeDifferentConstructor_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeDifferentConstructor.fir.kt");
+            }
+
+            @Test
+            @TestMetadata("returnTypeOverrideInKotlin.kt")
+            public void testReturnTypeOverrideInKotlin() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeOverrideInKotlin.kt");
+            }
+
+            @Test
+            @TestMetadata("returnTypeOverrideInKotlin.fir.kt")
+            public void testReturnTypeOverrideInKotlin_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeOverrideInKotlin.fir.kt");
+            }
+
+            @Test
+            @TestMetadata("returnTypeWithWarnings.kt")
+            public void testReturnTypeWithWarnings() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeWithWarnings.kt");
+            }
+
+            @Test
+            @TestMetadata("returnTypeWithWarnings.fir.kt")
+            public void testReturnTypeWithWarnings_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeWithWarnings.fir.kt");
+            }
+
+            @Test
+            @TestMetadata("returnType.fir.kt")
+            public void testReturnType_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnType.fir.kt");
+            }
+
+            @Test
+            @TestMetadata("simple.kt")
+            public void testSimple() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/simple.kt");
+            }
+
+            @Test
+            @TestMetadata("simple.fir.kt")
+            public void testSimple_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/simple.fir.kt");
+            }
+
+            @Test
+            @TestMetadata("valueParameter.kt")
+            public void testValueParameter() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameter.kt");
+            }
+
+            @Test
+            @TestMetadata("valueParameterWithWarnings.kt")
+            public void testValueParameterWithWarnings() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameterWithWarnings.kt");
+            }
+
+            @Test
+            @TestMetadata("valueParameterWithWarnings.fir.kt")
+            public void testValueParameterWithWarnings_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameterWithWarnings.fir.kt");
+            }
+
+            @Test
+            @TestMetadata("valueParameter.fir.kt")
+            public void testValueParameter_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameter.fir.kt");
             }
         }
     }
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsSourceJavaTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsSourceJavaTestGenerated.java
index 5ee316e022b..5d1a1f609b4 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsSourceJavaTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsSourceJavaTestGenerated.java
@@ -875,188 +875,168 @@ public class ForeignAnnotationsSourceJavaTestGenerated extends AbstractForeignAn
         }
 
         @Nested
-        @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement")
+        @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc")
         @TestDataPath("$PROJECT_ROOT")
-        public class TypeEnhancement {
+        public class Misc {
             @Test
-            public void testAllFilesPresentInTypeEnhancement() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            public void testAllFilesPresentInMisc() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc"), Pattern.compile("^(.+)\\.kt$"), null, true);
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled")
-            @TestDataPath("$PROJECT_ROOT")
-            public class OnCompiled {
-                @Test
-                public void testAllFilesPresentInOnCompiled() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled"), Pattern.compile("^(.+)\\.kt$"), null, true);
-                }
-
-                @Test
-                @TestMetadata("classTypeParameterBound.kt")
-                public void testClassTypeParameterBound() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBound.kt");
-                }
-
-                @Test
-                @TestMetadata("classTypeParameterBoundWithWarnings.kt")
-                public void testClassTypeParameterBoundWithWarnings() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBoundWithWarnings.kt");
-                }
-
-                @Test
-                @TestMetadata("classTypeParameterBoundWithWarnings.fir.kt")
-                public void testClassTypeParameterBoundWithWarnings_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBoundWithWarnings.fir.kt");
-                }
-
-                @Test
-                @TestMetadata("classTypeParameterBound.fir.kt")
-                public void testClassTypeParameterBound_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/classTypeParameterBound.fir.kt");
-                }
-
-                @Test
-                @TestMetadata("returnType.kt")
-                public void testReturnType() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnType.kt");
-                }
-
-                @Test
-                @TestMetadata("returnTypeWithWarnings.kt")
-                public void testReturnTypeWithWarnings() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnTypeWithWarnings.kt");
-                }
-
-                @Test
-                @TestMetadata("returnTypeWithWarnings.fir.kt")
-                public void testReturnTypeWithWarnings_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnTypeWithWarnings.fir.kt");
-                }
-
-                @Test
-                @TestMetadata("returnType.fir.kt")
-                public void testReturnType_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/returnType.fir.kt");
-                }
-
-                @Test
-                @TestMetadata("valueParameter.kt")
-                public void testValueParameter() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameter.kt");
-                }
-
-                @Test
-                @TestMetadata("valueParameterWithWarnings.kt")
-                public void testValueParameterWithWarnings() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameterWithWarnings.kt");
-                }
-
-                @Test
-                @TestMetadata("valueParameterWithWarnings.fir.kt")
-                public void testValueParameterWithWarnings_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameterWithWarnings.fir.kt");
-                }
-
-                @Test
-                @TestMetadata("valueParameter.fir.kt")
-                public void testValueParameter_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onCompiled/valueParameter.fir.kt");
-                }
+            @Test
+            @TestMetadata("annotatedTypeArguments.kt")
+            public void testAnnotatedTypeArguments() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/annotatedTypeArguments.kt");
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources")
-            @TestDataPath("$PROJECT_ROOT")
-            public class OnSources {
-                @Test
-                public void testAllFilesPresentInOnSources() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources"), Pattern.compile("^(.+)\\.kt$"), null, true);
-                }
+            @Test
+            @TestMetadata("annotatedTypeArguments.fir.kt")
+            public void testAnnotatedTypeArguments_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/annotatedTypeArguments.fir.kt");
+            }
 
-                @Test
-                @TestMetadata("annotatedTypeArguments.kt")
-                public void testAnnotatedTypeArguments() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/annotatedTypeArguments.kt");
-                }
+            @Test
+            @TestMetadata("classTypeParameterBound.kt")
+            public void testClassTypeParameterBound() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBound.kt");
+            }
 
-                @Test
-                @TestMetadata("annotatedTypeArguments.fir.kt")
-                public void testAnnotatedTypeArguments_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/annotatedTypeArguments.fir.kt");
-                }
+            @Test
+            @TestMetadata("classTypeParameterBoundWithWarnings.kt")
+            public void testClassTypeParameterBoundWithWarnings() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBoundWithWarnings.kt");
+            }
 
-                @Test
-                @TestMetadata("methodWithTypeParameter.kt")
-                public void testMethodWithTypeParameter() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/methodWithTypeParameter.kt");
-                }
+            @Test
+            @TestMetadata("classTypeParameterBoundWithWarnings.fir.kt")
+            public void testClassTypeParameterBoundWithWarnings_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBoundWithWarnings.fir.kt");
+            }
 
-                @Test
-                @TestMetadata("methodWithTypeParameter.fir.kt")
-                public void testMethodWithTypeParameter_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/methodWithTypeParameter.fir.kt");
-                }
+            @Test
+            @TestMetadata("classTypeParameterBound.fir.kt")
+            public void testClassTypeParameterBound_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/classTypeParameterBound.fir.kt");
+            }
 
-                @Test
-                @TestMetadata("notNullVarargsOverrides.kt")
-                public void testNotNullVarargsOverrides() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/notNullVarargsOverrides.kt");
-                }
+            @Test
+            @TestMetadata("methodWithTypeParameter.kt")
+            public void testMethodWithTypeParameter() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.kt");
+            }
 
-                @Test
-                @TestMetadata("notNullVarargsOverrides.fir.kt")
-                public void testNotNullVarargsOverrides_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/notNullVarargsOverrides.fir.kt");
-                }
+            @Test
+            @TestMetadata("methodWithTypeParameter.fir.kt")
+            public void testMethodWithTypeParameter_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.fir.kt");
+            }
 
-                @Test
-                @TestMetadata("nullableVarargsOverrides.kt")
-                public void testNullableVarargsOverrides() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/nullableVarargsOverrides.kt");
-                }
+            @Test
+            @TestMetadata("notNullVarargsOverrides.kt")
+            public void testNotNullVarargsOverrides() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/notNullVarargsOverrides.kt");
+            }
 
-                @Test
-                @TestMetadata("nullableVarargsOverrides.fir.kt")
-                public void testNullableVarargsOverrides_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/nullableVarargsOverrides.fir.kt");
-                }
+            @Test
+            @TestMetadata("notNullVarargsOverrides.fir.kt")
+            public void testNotNullVarargsOverrides_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/notNullVarargsOverrides.fir.kt");
+            }
 
-                @Test
-                @TestMetadata("returnTypeDifferentConstructor.kt")
-                public void testReturnTypeDifferentConstructor() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeDifferentConstructor.kt");
-                }
+            @Test
+            @TestMetadata("nullableVarargsOverrides.kt")
+            public void testNullableVarargsOverrides() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/nullableVarargsOverrides.kt");
+            }
 
-                @Test
-                @TestMetadata("returnTypeDifferentConstructor.fir.kt")
-                public void testReturnTypeDifferentConstructor_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeDifferentConstructor.fir.kt");
-                }
+            @Test
+            @TestMetadata("nullableVarargsOverrides.fir.kt")
+            public void testNullableVarargsOverrides_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/nullableVarargsOverrides.fir.kt");
+            }
 
-                @Test
-                @TestMetadata("returnTypeOverrideInKotlin.kt")
-                public void testReturnTypeOverrideInKotlin() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeOverrideInKotlin.kt");
-                }
+            @Test
+            @TestMetadata("returnType.kt")
+            public void testReturnType() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnType.kt");
+            }
 
-                @Test
-                @TestMetadata("returnTypeOverrideInKotlin.fir.kt")
-                public void testReturnTypeOverrideInKotlin_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/returnTypeOverrideInKotlin.fir.kt");
-                }
+            @Test
+            @TestMetadata("returnTypeDifferentConstructor.kt")
+            public void testReturnTypeDifferentConstructor() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeDifferentConstructor.kt");
+            }
 
-                @Test
-                @TestMetadata("simple.kt")
-                public void testSimple() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/simple.kt");
-                }
+            @Test
+            @TestMetadata("returnTypeDifferentConstructor.fir.kt")
+            public void testReturnTypeDifferentConstructor_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeDifferentConstructor.fir.kt");
+            }
 
-                @Test
-                @TestMetadata("simple.fir.kt")
-                public void testSimple_fir() throws Exception {
-                    runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/typeEnhancement/onSources/simple.fir.kt");
-                }
+            @Test
+            @TestMetadata("returnTypeOverrideInKotlin.kt")
+            public void testReturnTypeOverrideInKotlin() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeOverrideInKotlin.kt");
+            }
+
+            @Test
+            @TestMetadata("returnTypeOverrideInKotlin.fir.kt")
+            public void testReturnTypeOverrideInKotlin_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeOverrideInKotlin.fir.kt");
+            }
+
+            @Test
+            @TestMetadata("returnTypeWithWarnings.kt")
+            public void testReturnTypeWithWarnings() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeWithWarnings.kt");
+            }
+
+            @Test
+            @TestMetadata("returnTypeWithWarnings.fir.kt")
+            public void testReturnTypeWithWarnings_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnTypeWithWarnings.fir.kt");
+            }
+
+            @Test
+            @TestMetadata("returnType.fir.kt")
+            public void testReturnType_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/returnType.fir.kt");
+            }
+
+            @Test
+            @TestMetadata("simple.kt")
+            public void testSimple() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/simple.kt");
+            }
+
+            @Test
+            @TestMetadata("simple.fir.kt")
+            public void testSimple_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/simple.fir.kt");
+            }
+
+            @Test
+            @TestMetadata("valueParameter.kt")
+            public void testValueParameter() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameter.kt");
+            }
+
+            @Test
+            @TestMetadata("valueParameterWithWarnings.kt")
+            public void testValueParameterWithWarnings() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameterWithWarnings.kt");
+            }
+
+            @Test
+            @TestMetadata("valueParameterWithWarnings.fir.kt")
+            public void testValueParameterWithWarnings_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameterWithWarnings.fir.kt");
+            }
+
+            @Test
+            @TestMetadata("valueParameter.fir.kt")
+            public void testValueParameter_fir() throws Exception {
+                runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/valueParameter.fir.kt");
             }
         }
     }
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/ForeignAnnotationsDirectives.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/ForeignAnnotationsDirectives.kt
index 495ad835c76..40551afe172 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/ForeignAnnotationsDirectives.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/ForeignAnnotationsDirectives.kt
@@ -37,4 +37,8 @@ object ForeignAnnotationsDirectives : SimpleDirectivesContainer() {
     val SOURCE_RETENTION_ANNOTATIONS by directive(
         description = "Skip test against compiled annotation because of their Source retention"
     )
+
+    val MUTE_FOR_PSI_CLASS_FILES_READING by directive(
+        description = "Skip test if psi class files reading is used"
+    )
 }
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractForeignAnnotationsTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractForeignAnnotationsTest.kt
index acc024adf9b..2df9675052d 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractForeignAnnotationsTest.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractForeignAnnotationsTest.kt
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.test.model.FrontendKinds
 import org.jetbrains.kotlin.test.preprocessors.JspecifyMarksCleanupPreprocessor
 import org.jetbrains.kotlin.test.services.configuration.*
 import org.jetbrains.kotlin.test.services.jvm.ForeignAnnotationAgainstCompiledJavaTestSuppressor
+import org.jetbrains.kotlin.test.services.jvm.PsiClassFilesReadingForCompiledJavaTestSuppressor
 import org.jetbrains.kotlin.test.services.sourceProviders.AdditionalDiagnosticsSourceFilesProvider
 import org.jetbrains.kotlin.test.services.sourceProviders.CoroutineHelpersSourceFilesProvider
 
@@ -116,6 +117,8 @@ abstract class AbstractForeignAnnotationsCompiledJavaWithPsiClassReadingTest : A
             defaultDirectives {
                 +USE_PSI_CLASS_FILES_READING
             }
+
+            useMetaTestConfigurators(::PsiClassFilesReadingForCompiledJavaTestSuppressor)
         }
     }
 }
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/jvm/PsiClassFilesReadingForCompiledJavaTestSuppressor.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/jvm/PsiClassFilesReadingForCompiledJavaTestSuppressor.kt
new file mode 100644
index 00000000000..f36c8336819
--- /dev/null
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/jvm/PsiClassFilesReadingForCompiledJavaTestSuppressor.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.test.services.jvm
+
+import org.jetbrains.kotlin.test.directives.ForeignAnnotationsDirectives.MUTE_FOR_PSI_CLASS_FILES_READING
+import org.jetbrains.kotlin.test.services.MetaTestConfigurator
+import org.jetbrains.kotlin.test.services.TestServices
+import org.jetbrains.kotlin.test.services.moduleStructure
+import org.jetbrains.kotlin.test.utils.isDirectiveDefined
+
+class PsiClassFilesReadingForCompiledJavaTestSuppressor(testServices: TestServices) : MetaTestConfigurator(testServices) {
+    override fun shouldSkipTest(): Boolean {
+        val testFile = testServices.moduleStructure.originalTestDataFiles.first()
+        return testFile.isDirectiveDefined("// ${MUTE_FOR_PSI_CLASS_FILES_READING.name}")
+    }
+}
diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
index d766fe39bc9..95580ad924a 100644
--- a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
+++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
@@ -61,8 +61,7 @@ fun generateJUnit5CompilerTests(args: Array<String>) {
 
             testClass<AbstractForeignAnnotationsCompiledJavaWithPsiClassReadingTest> {
                 model("diagnostics/foreignAnnotationsTests/tests")
-                // TODO: remove exclusion of these dirs after advance dependent intellij platform
-                model("diagnostics/foreignAnnotationsTests/java8Tests", excludeDirs = listOf("jspecify", "typeEnhancement/onCompiled"))
+                model("diagnostics/foreignAnnotationsTests/java8Tests",)
                 model("diagnostics/foreignAnnotationsTests/java9Tests")
             }