diff --git a/compiler/fir/resolve/testData/resolve/problems/covariantArrayAsReceiver.kt b/compiler/fir/resolve/testData/resolve/covariantArrayAsReceiver.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/covariantArrayAsReceiver.kt
rename to compiler/fir/resolve/testData/resolve/covariantArrayAsReceiver.kt
diff --git a/compiler/fir/resolve/testData/resolve/problems/covariantArrayAsReceiver.txt b/compiler/fir/resolve/testData/resolve/covariantArrayAsReceiver.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolve/problems/covariantArrayAsReceiver.txt
rename to compiler/fir/resolve/testData/resolve/covariantArrayAsReceiver.txt
diff --git a/compiler/fir/resolve/testData/resolveWithStdlib/problems/inapplicableRemoveAll.kt b/compiler/fir/resolve/testData/resolveWithStdlib/inapplicableRemoveAll.kt
similarity index 100%
rename from compiler/fir/resolve/testData/resolveWithStdlib/problems/inapplicableRemoveAll.kt
rename to compiler/fir/resolve/testData/resolveWithStdlib/inapplicableRemoveAll.kt
diff --git a/compiler/fir/resolve/testData/resolveWithStdlib/problems/inapplicableRemoveAll.txt b/compiler/fir/resolve/testData/resolveWithStdlib/inapplicableRemoveAll.txt
similarity index 100%
rename from compiler/fir/resolve/testData/resolveWithStdlib/problems/inapplicableRemoveAll.txt
rename to compiler/fir/resolve/testData/resolveWithStdlib/inapplicableRemoveAll.txt
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
index b32a3f121b3..c21ddcd6915 100644
--- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
+++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
@@ -58,6 +58,11 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
         runTest("compiler/fir/resolve/testData/resolve/copy.kt");
     }
 
+    @TestMetadata("covariantArrayAsReceiver.kt")
+    public void testCovariantArrayAsReceiver() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/covariantArrayAsReceiver.kt");
+    }
+
     @TestMetadata("defaultJavaImportHiding.kt")
     public void testDefaultJavaImportHiding() throws Exception {
         runTest("compiler/fir/resolve/testData/resolve/defaultJavaImportHiding.kt");
@@ -1279,11 +1284,6 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
             runTest("compiler/fir/resolve/testData/resolve/problems/callableReferencesAndDefaultParameters.kt");
         }
 
-        @TestMetadata("covariantArrayAsReceiver.kt")
-        public void testCovariantArrayAsReceiver() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/covariantArrayAsReceiver.kt");
-        }
-
         @TestMetadata("definetelyNotNullForTypeParameter.kt")
         public void testDefinetelyNotNullForTypeParameter() throws Exception {
             runTest("compiler/fir/resolve/testData/resolve/problems/definetelyNotNullForTypeParameter.kt");
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java
index 2ca0ca7e745..2eea92315c0 100644
--- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java
+++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java
@@ -58,6 +58,11 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
         runTest("compiler/fir/resolve/testData/resolve/copy.kt");
     }
 
+    @TestMetadata("covariantArrayAsReceiver.kt")
+    public void testCovariantArrayAsReceiver() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolve/covariantArrayAsReceiver.kt");
+    }
+
     @TestMetadata("defaultJavaImportHiding.kt")
     public void testDefaultJavaImportHiding() throws Exception {
         runTest("compiler/fir/resolve/testData/resolve/defaultJavaImportHiding.kt");
@@ -1279,11 +1284,6 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
             runTest("compiler/fir/resolve/testData/resolve/problems/callableReferencesAndDefaultParameters.kt");
         }
 
-        @TestMetadata("covariantArrayAsReceiver.kt")
-        public void testCovariantArrayAsReceiver() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolve/problems/covariantArrayAsReceiver.kt");
-        }
-
         @TestMetadata("definetelyNotNullForTypeParameter.kt")
         public void testDefinetelyNotNullForTypeParameter() throws Exception {
             runTest("compiler/fir/resolve/testData/resolve/problems/definetelyNotNullForTypeParameter.kt");
diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java
index 4a9b05b921b..376b71484d5 100644
--- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java
+++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java
@@ -138,6 +138,11 @@ public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnostic
         runTest("compiler/fir/resolve/testData/resolveWithStdlib/implicitReceiverOrder.kt");
     }
 
+    @TestMetadata("inapplicableRemoveAll.kt")
+    public void testInapplicableRemoveAll() throws Exception {
+        runTest("compiler/fir/resolve/testData/resolveWithStdlib/inapplicableRemoveAll.kt");
+    }
+
     @TestMetadata("javaEnumSynthetic.kt")
     public void testJavaEnumSynthetic() throws Exception {
         runTest("compiler/fir/resolve/testData/resolveWithStdlib/javaEnumSynthetic.kt");
@@ -675,11 +680,6 @@ public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnostic
             runTest("compiler/fir/resolve/testData/resolveWithStdlib/problems/delegateTypeMismatch.kt");
         }
 
-        @TestMetadata("inapplicableRemoveAll.kt")
-        public void testInapplicableRemoveAll() throws Exception {
-            runTest("compiler/fir/resolve/testData/resolveWithStdlib/problems/inapplicableRemoveAll.kt");
-        }
-
         @TestMetadata("invokePriority.kt")
         public void testInvokePriority() throws Exception {
             runTest("compiler/fir/resolve/testData/resolveWithStdlib/problems/invokePriority.kt");