diff --git a/compiler/testData/cli/metadata/anonymousObjectTypeWithFir.args b/compiler/testData/cli/metadata/anonymousObjectTypeWithFir.args
deleted file mode 100644
index b78831a17a8..00000000000
--- a/compiler/testData/cli/metadata/anonymousObjectTypeWithFir.args
+++ /dev/null
@@ -1,5 +0,0 @@
-$TESTDATA_DIR$/anonymousObjectType.kt
--d
-$TEMP_DIR$
--language-version
-2.0
diff --git a/compiler/testData/cli/metadata/anonymousObjectTypeWithFir.out b/compiler/testData/cli/metadata/anonymousObjectTypeWithFir.out
deleted file mode 100644
index d86bac9de59..00000000000
--- a/compiler/testData/cli/metadata/anonymousObjectTypeWithFir.out
+++ /dev/null
@@ -1 +0,0 @@
-OK
diff --git a/compiler/testData/cli/metadata/inheritorOfExpectSealedClassWithFir.args b/compiler/testData/cli/metadata/inheritorOfExpectSealedClassWithFir.args
deleted file mode 100644
index 74e779622ee..00000000000
--- a/compiler/testData/cli/metadata/inheritorOfExpectSealedClassWithFir.args
+++ /dev/null
@@ -1,13 +0,0 @@
-$TESTDATA_DIR$/inheritorOfExpectSealedClass/common-1.kt
-$TESTDATA_DIR$/inheritorOfExpectSealedClass/common-2.kt
-$TESTDATA_DIR$/inheritorOfExpectSealedClass/common-3.kt
--d
-$TEMP_DIR$
--language-version
-2.0
--Xfragments=a,b,c
--Xfragment-sources=a\:$TESTDATA_DIR$/inheritorOfExpectSealedClass/common-1.kt
--Xfragment-sources=b\:$TESTDATA_DIR$/inheritorOfExpectSealedClass/common-2.kt
--Xfragment-sources=c\:$TESTDATA_DIR$/inheritorOfExpectSealedClass/common-3.kt
--Xfragment-refines=b\:a
--Xfragment-refines=c\:b
\ No newline at end of file
diff --git a/compiler/testData/cli/metadata/inheritorOfExpectSealedClassWithFir.out b/compiler/testData/cli/metadata/inheritorOfExpectSealedClassWithFir.out
deleted file mode 100644
index 6d33a51c221..00000000000
--- a/compiler/testData/cli/metadata/inheritorOfExpectSealedClassWithFir.out
+++ /dev/null
@@ -1,2 +0,0 @@
-error: HMPP module structure should not be passed during metadata compilation. Please remove `-Xfragments` and related flags
-COMPILATION_ERROR
diff --git a/compiler/testData/cli/metadata/kotlinPackageWithFir.args b/compiler/testData/cli/metadata/kotlinPackageWithFir.args
deleted file mode 100644
index 4c498378196..00000000000
--- a/compiler/testData/cli/metadata/kotlinPackageWithFir.args
+++ /dev/null
@@ -1,5 +0,0 @@
-$TESTDATA_DIR$/../kotlinPackage.kt
--d
-$TEMP_DIR$
--language-version
-2.0
diff --git a/compiler/testData/cli/metadata/kotlinPackageWithFir.out b/compiler/testData/cli/metadata/kotlinPackageWithFir.out
deleted file mode 100644
index 806c7c329f3..00000000000
--- a/compiler/testData/cli/metadata/kotlinPackageWithFir.out
+++ /dev/null
@@ -1,4 +0,0 @@
-compiler/testData/cli/kotlinPackage.kt:1:1: error: only the Kotlin standard library is allowed to use the 'kotlin' package
-package kotlin.mylibrary
-^
-COMPILATION_ERROR
diff --git a/compiler/testData/cli/metadata/lambdaWithReceiverWithFir.args b/compiler/testData/cli/metadata/lambdaWithReceiverWithFir.args
deleted file mode 100644
index 50b83534251..00000000000
--- a/compiler/testData/cli/metadata/lambdaWithReceiverWithFir.args
+++ /dev/null
@@ -1,7 +0,0 @@
-$TESTDATA_DIR$/lambdaWithReceiver.kt
--d
-$TEMP_DIR$
--cp
-$TESTDATA_DIR$/../../../../dist/common/kotlin-stdlib-common.jar
--language-version
-2.0
diff --git a/compiler/testData/cli/metadata/lambdaWithReceiverWithFir.out b/compiler/testData/cli/metadata/lambdaWithReceiverWithFir.out
deleted file mode 100644
index d86bac9de59..00000000000
--- a/compiler/testData/cli/metadata/lambdaWithReceiverWithFir.out
+++ /dev/null
@@ -1 +0,0 @@
-OK
diff --git a/compiler/testData/cli/metadata/moduleNameWithFir.args b/compiler/testData/cli/metadata/moduleNameWithFir.args
deleted file mode 100644
index 601c5d995a3..00000000000
--- a/compiler/testData/cli/metadata/moduleNameWithFir.args
+++ /dev/null
@@ -1,7 +0,0 @@
-$TESTDATA_DIR$/moduleName.kt
--d
-$TEMP_DIR$
--module-name
-foo
--language-version
-2.0
diff --git a/compiler/testData/cli/metadata/moduleNameWithFir.out b/compiler/testData/cli/metadata/moduleNameWithFir.out
deleted file mode 100644
index d86bac9de59..00000000000
--- a/compiler/testData/cli/metadata/moduleNameWithFir.out
+++ /dev/null
@@ -1 +0,0 @@
-OK
diff --git a/compiler/testData/cli/metadata/optionalAnnotationsFromMetadataWithFir.args b/compiler/testData/cli/metadata/optionalAnnotationsFromMetadataWithFir.args
deleted file mode 100644
index a17bb96ac11..00000000000
--- a/compiler/testData/cli/metadata/optionalAnnotationsFromMetadataWithFir.args
+++ /dev/null
@@ -1,7 +0,0 @@
-$TESTDATA_DIR$/optionalAnnotationsFromMetadata.kt
--d
-$TEMP_DIR$
--cp
-$TESTDATA_DIR$/../../../../dist/common/kotlin-stdlib-common.jar
--language-version
-2.0
\ No newline at end of file
diff --git a/compiler/testData/cli/metadata/optionalAnnotationsFromMetadataWithFir.out b/compiler/testData/cli/metadata/optionalAnnotationsFromMetadataWithFir.out
deleted file mode 100644
index d86bac9de59..00000000000
--- a/compiler/testData/cli/metadata/optionalAnnotationsFromMetadataWithFir.out
+++ /dev/null
@@ -1 +0,0 @@
-OK
diff --git a/compiler/testData/cli/metadata/optionalExpectationUsageWithFir.args b/compiler/testData/cli/metadata/optionalExpectationUsageWithFir.args
deleted file mode 100644
index 29081c401ae..00000000000
--- a/compiler/testData/cli/metadata/optionalExpectationUsageWithFir.args
+++ /dev/null
@@ -1,7 +0,0 @@
-$TESTDATA_DIR$/optionalExpectationUsage.kt
--d
-$TEMP_DIR$
--cp
-$TESTDATA_DIR$/../../../../dist/common/kotlin-stdlib-common.jar
--language-version
-2.0
diff --git a/compiler/testData/cli/metadata/optionalExpectationUsageWithFir.out b/compiler/testData/cli/metadata/optionalExpectationUsageWithFir.out
deleted file mode 100644
index d86bac9de59..00000000000
--- a/compiler/testData/cli/metadata/optionalExpectationUsageWithFir.out
+++ /dev/null
@@ -1 +0,0 @@
-OK
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java
index 51dcd6431ba..5c1a3d574de 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java
@@ -1564,11 +1564,6 @@ public class CliTestGenerated extends AbstractCliTest {
             runTest("compiler/testData/cli/metadata/anonymousObjectType.args");
         }
 
-        @TestMetadata("anonymousObjectTypeWithFir.args")
-        public void testAnonymousObjectTypeWithFir() throws Exception {
-            runTest("compiler/testData/cli/metadata/anonymousObjectTypeWithFir.args");
-        }
-
         @TestMetadata("hmppModules.args")
         public void testHmppModules() throws Exception {
             runTest("compiler/testData/cli/metadata/hmppModules.args");
@@ -1579,21 +1574,11 @@ public class CliTestGenerated extends AbstractCliTest {
             runTest("compiler/testData/cli/metadata/inheritorOfExpectSealedClass.args");
         }
 
-        @TestMetadata("inheritorOfExpectSealedClassWithFir.args")
-        public void testInheritorOfExpectSealedClassWithFir() throws Exception {
-            runTest("compiler/testData/cli/metadata/inheritorOfExpectSealedClassWithFir.args");
-        }
-
         @TestMetadata("kotlinPackage.args")
         public void testKotlinPackage() throws Exception {
             runTest("compiler/testData/cli/metadata/kotlinPackage.args");
         }
 
-        @TestMetadata("kotlinPackageWithFir.args")
-        public void testKotlinPackageWithFir() throws Exception {
-            runTest("compiler/testData/cli/metadata/kotlinPackageWithFir.args");
-        }
-
         @TestMetadata("kt58139.args")
         public void testKt58139() throws Exception {
             runTest("compiler/testData/cli/metadata/kt58139.args");
@@ -1604,21 +1589,11 @@ public class CliTestGenerated extends AbstractCliTest {
             runTest("compiler/testData/cli/metadata/lambdaWithReceiver.args");
         }
 
-        @TestMetadata("lambdaWithReceiverWithFir.args")
-        public void testLambdaWithReceiverWithFir() throws Exception {
-            runTest("compiler/testData/cli/metadata/lambdaWithReceiverWithFir.args");
-        }
-
         @TestMetadata("moduleName.args")
         public void testModuleName() throws Exception {
             runTest("compiler/testData/cli/metadata/moduleName.args");
         }
 
-        @TestMetadata("moduleNameWithFir.args")
-        public void testModuleNameWithFir() throws Exception {
-            runTest("compiler/testData/cli/metadata/moduleNameWithFir.args");
-        }
-
         @TestMetadata("noVirtualFileHiddenForMemberWithPlatformDependentAnnotation.args")
         public void testNoVirtualFileHiddenForMemberWithPlatformDependentAnnotation() throws Exception {
             runTest("compiler/testData/cli/metadata/noVirtualFileHiddenForMemberWithPlatformDependentAnnotation.args");
@@ -1629,19 +1604,9 @@ public class CliTestGenerated extends AbstractCliTest {
             runTest("compiler/testData/cli/metadata/optionalAnnotationsFromMetadata.args");
         }
 
-        @TestMetadata("optionalAnnotationsFromMetadataWithFir.args")
-        public void testOptionalAnnotationsFromMetadataWithFir() throws Exception {
-            runTest("compiler/testData/cli/metadata/optionalAnnotationsFromMetadataWithFir.args");
-        }
-
         @TestMetadata("optionalExpectationUsage.args")
         public void testOptionalExpectationUsage() throws Exception {
             runTest("compiler/testData/cli/metadata/optionalExpectationUsage.args");
         }
-
-        @TestMetadata("optionalExpectationUsageWithFir.args")
-        public void testOptionalExpectationUsageWithFir() throws Exception {
-            runTest("compiler/testData/cli/metadata/optionalExpectationUsageWithFir.args");
-        }
     }
 }