diff --git a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.fir.kt
deleted file mode 100644
index cf6f0e4f55c..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.fir.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// !EXPLICIT_FLEXIBLE_TYPES
-// !CHECK_TYPE
-
-fun foo(f: ft<Int, Int?>) {
-    f.checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
-    f.checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Int?>() }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.kt b/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.kt
deleted file mode 100644
index ccacc81d250..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// !EXPLICIT_FLEXIBLE_TYPES
-// !CHECK_TYPE
-
-fun foo(f: ft<Int, Int?>) {
-    f.checkType { _<Int>() }
-    f.checkType { _<Int?>() }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.txt b/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.txt
deleted file mode 100644
index c5b8c00758e..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-package
-
-public fun foo(/*0*/ f: kotlin.Int!): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.fir.kt
deleted file mode 100644
index 2df300ed26b..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.fir.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// !EXPLICIT_FLEXIBLE_TYPES
-// !CHECK_TYPE
-package ppp
-
-import checkType
-import _
-
-fun foo(f: ft<Int, Int?>) {
-    f.checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Int>() }
-    f.checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Int?>() }
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.kt b/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.kt
deleted file mode 100644
index 1970c6ef232..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// !EXPLICIT_FLEXIBLE_TYPES
-// !CHECK_TYPE
-package ppp
-
-import checkType
-import _
-
-fun foo(f: ft<Int, Int?>) {
-    f.checkType { _<Int>() }
-    f.checkType { _<Int?>() }
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.txt b/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.txt
deleted file mode 100644
index acbddeb24f9..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-package
-
-package ppp {
-    public fun foo(/*0*/ f: kotlin.Int!): kotlin.Unit
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/intersection/map.kt b/compiler/testData/diagnostics/tests/platformTypes/intersection/map.kt
deleted file mode 100644
index 154d9cd7c1c..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/intersection/map.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-// FIR_IDENTICAL
-// !CHECK_TYPE
-// !EXPLICIT_FLEXIBLE_TYPES
-
-fun foo(
-        p1: ft<MutableMap<Int, String>, Map<Int, String>?>,
-        p2: Map<Int, String>
-) = p1 == p2
-
-fun foo(
-        p1: ft<String, String?>,
-        p2: String
-) = p1 == p2
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/platformTypes/intersection/map.txt b/compiler/testData/diagnostics/tests/platformTypes/intersection/map.txt
deleted file mode 100644
index ecc60dc6cf2..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/intersection/map.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-package
-
-public fun foo(/*0*/ p1: kotlin.String!, /*1*/ p2: kotlin.String): kotlin.Boolean
-public fun foo(/*0*/ p1: kotlin.collections.(Mutable)Map<kotlin.Int, kotlin.String>!, /*1*/ p2: kotlin.collections.Map<kotlin.Int, kotlin.String>): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/platformTypes/supertypeArgumentsExplicit.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/supertypeArgumentsExplicit.fir.kt
deleted file mode 100644
index eb566663584..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/supertypeArgumentsExplicit.fir.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-// !EXPLICIT_FLEXIBLE_TYPES
-
-interface A<T>
-interface B<T>: A<ft<T, T?>>
-
-interface C: A<String>, B<String>
-interface D: B<String>, A<String>
-interface E: A<String?>, B<String?>
-interface F: A<String?>, B<String>
-
-interface G: A<String>, B<String?>
-interface H: A<Int>, B<String>
-interface I: B<Int>, A<String>
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/platformTypes/supertypeArgumentsExplicit.kt b/compiler/testData/diagnostics/tests/platformTypes/supertypeArgumentsExplicit.kt
deleted file mode 100644
index 4b897e4a36a..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/supertypeArgumentsExplicit.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-// !EXPLICIT_FLEXIBLE_TYPES
-
-interface A<T>
-interface B<T>: A<ft<T, T?>>
-
-interface C: A<String>, B<String>
-interface D: B<String>, A<String>
-interface E: A<String?>, B<String?>
-interface F: A<String?>, B<String>
-
-interface G: <!INCONSISTENT_TYPE_PARAMETER_VALUES!>A<String>, B<String?><!>
-interface H: <!INCONSISTENT_TYPE_PARAMETER_VALUES!>A<Int>, B<String><!>
-interface I: <!INCONSISTENT_TYPE_PARAMETER_VALUES!>B<Int>, A<String><!>
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/platformTypes/supertypeArgumentsExplicit.txt b/compiler/testData/diagnostics/tests/platformTypes/supertypeArgumentsExplicit.txt
deleted file mode 100644
index da466df5bdb..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/supertypeArgumentsExplicit.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-package
-
-public interface A</*0*/ T> {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface B</*0*/ T> : A<T!> {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface C : A<kotlin.String>, B<kotlin.String> {
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface D : B<kotlin.String>, A<kotlin.String> {
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface E : A<kotlin.String?>, B<kotlin.String?> {
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface F : A<kotlin.String?>, B<kotlin.String> {
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface G : A<kotlin.String>, B<kotlin.String?> {
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface H : A<kotlin.Int>, B<kotlin.String> {
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface I : B<kotlin.Int>, A<kotlin.String> {
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
index 32ecc111bb8..776ba577819 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
@@ -19573,18 +19573,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                 runTest("compiler/testData/diagnostics/tests/platformTypes/elvis.kt");
             }
 
-            @Test
-            @TestMetadata("explicitFlexibleNoPackage.kt")
-            public void testExplicitFlexibleNoPackage() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.kt");
-            }
-
-            @Test
-            @TestMetadata("explicitFlexibleWithPackage.kt")
-            public void testExplicitFlexibleWithPackage() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.kt");
-            }
-
             @Test
             @TestMetadata("getParentOfType.kt")
             public void testGetParentOfType() throws Exception {
@@ -19663,12 +19651,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                 runTest("compiler/testData/diagnostics/tests/platformTypes/samConstructor.kt");
             }
 
-            @Test
-            @TestMetadata("supertypeArgumentsExplicit.kt")
-            public void testSupertypeArgumentsExplicit() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/platformTypes/supertypeArgumentsExplicit.kt");
-            }
-
             @Test
             @TestMetadata("supertypeTypeArguments.kt")
             public void testSupertypeTypeArguments() throws Exception {
@@ -19791,22 +19773,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/diagnostics/tests/platformTypes/intersection")
-            @TestDataPath("$PROJECT_ROOT")
-            public class Intersection extends AbstractDiagnosticTest {
-                @Test
-                public void testAllFilesPresentInIntersection() throws Exception {
-                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes/intersection"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
-                }
-
-                @Test
-                @TestMetadata("map.kt")
-                public void testMap() throws Exception {
-                    runTest("compiler/testData/diagnostics/tests/platformTypes/intersection/map.kt");
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall")
             @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
index 016fda8f4ba..a61fc273b49 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
@@ -19567,18 +19567,6 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
                 runTest("compiler/testData/diagnostics/tests/platformTypes/elvis.kt");
             }
 
-            @Test
-            @TestMetadata("explicitFlexibleNoPackage.kt")
-            public void testExplicitFlexibleNoPackage() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.kt");
-            }
-
-            @Test
-            @TestMetadata("explicitFlexibleWithPackage.kt")
-            public void testExplicitFlexibleWithPackage() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.kt");
-            }
-
             @Test
             @TestMetadata("getParentOfType.kt")
             public void testGetParentOfType() throws Exception {
@@ -19657,12 +19645,6 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
                 runTest("compiler/testData/diagnostics/tests/platformTypes/samConstructor.kt");
             }
 
-            @Test
-            @TestMetadata("supertypeArgumentsExplicit.kt")
-            public void testSupertypeArgumentsExplicit() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/platformTypes/supertypeArgumentsExplicit.kt");
-            }
-
             @Test
             @TestMetadata("supertypeTypeArguments.kt")
             public void testSupertypeTypeArguments() throws Exception {
@@ -19785,22 +19767,6 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/diagnostics/tests/platformTypes/intersection")
-            @TestDataPath("$PROJECT_ROOT")
-            public class Intersection extends AbstractFirDiagnosticTest {
-                @Test
-                public void testAllFilesPresentInIntersection() throws Exception {
-                    KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes/intersection"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
-                }
-
-                @Test
-                @TestMetadata("map.kt")
-                public void testMap() throws Exception {
-                    runTest("compiler/testData/diagnostics/tests/platformTypes/intersection/map.kt");
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall")
             @TestDataPath("$PROJECT_ROOT")