diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirFileScopeTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirFileScopeTestGenerated.java
index fb9104afb88..16de73c404a 100644
--- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirFileScopeTestGenerated.java
+++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirFileScopeTestGenerated.java
@@ -16,17 +16,17 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("analysis/analysis-api/testData/fileScopeTest")
+@TestMetadata("analysis/analysis-api/testData/scopes/fileScopeTest")
 @TestDataPath("$PROJECT_ROOT")
 public class FirFileScopeTestGenerated extends AbstractFirFileScopeTest {
     @Test
     public void testAllFilesPresentInFileScopeTest() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/fileScopeTest"), Pattern.compile("^(.+)\\.kt$"), null, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/scopes/fileScopeTest"), Pattern.compile("^(.+)\\.kt$"), null, true);
     }
 
     @Test
     @TestMetadata("simpleFileScope.kt")
     public void testSimpleFileScope() throws Exception {
-        runTest("analysis/analysis-api/testData/fileScopeTest/simpleFileScope.kt");
+        runTest("analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.kt");
     }
 }
diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirMemberScopeByFqNameTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirMemberScopeByFqNameTestGenerated.java
index 86331ed91ba..1ad17dc076c 100644
--- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirMemberScopeByFqNameTestGenerated.java
+++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirMemberScopeByFqNameTestGenerated.java
@@ -16,35 +16,35 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("analysis/analysis-api/testData/memberScopeByFqName")
+@TestMetadata("analysis/analysis-api/testData/scopes/memberScopeByFqName")
 @TestDataPath("$PROJECT_ROOT")
 public class FirMemberScopeByFqNameTestGenerated extends AbstractFirMemberScopeByFqNameTest {
     @Test
     public void testAllFilesPresentInMemberScopeByFqName() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/memberScopeByFqName"), Pattern.compile("^(.+)\\.kt$"), null, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/scopes/memberScopeByFqName"), Pattern.compile("^(.+)\\.kt$"), null, true);
     }
 
     @Test
     @TestMetadata("Int.kt")
     public void testInt() throws Exception {
-        runTest("analysis/analysis-api/testData/memberScopeByFqName/Int.kt");
+        runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.kt");
     }
 
     @Test
     @TestMetadata("java.lang.String.kt")
     public void testJava_lang_String() throws Exception {
-        runTest("analysis/analysis-api/testData/memberScopeByFqName/java.lang.String.kt");
+        runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.kt");
     }
 
     @Test
     @TestMetadata("kotlin.Function2.kt")
     public void testKotlin_Function2() throws Exception {
-        runTest("analysis/analysis-api/testData/memberScopeByFqName/kotlin.Function2.kt");
+        runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.kt");
     }
 
     @Test
     @TestMetadata("MutableList.kt")
     public void testMutableList() throws Exception {
-        runTest("analysis/analysis-api/testData/memberScopeByFqName/MutableList.kt");
+        runTest("analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.kt");
     }
 }
diff --git a/analysis/analysis-api/testData/fileScopeTest/simpleFileScope.kt b/analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.kt
similarity index 100%
rename from analysis/analysis-api/testData/fileScopeTest/simpleFileScope.kt
rename to analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.kt
diff --git a/analysis/analysis-api/testData/fileScopeTest/simpleFileScope.kt.result b/analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.kt.result
similarity index 100%
rename from analysis/analysis-api/testData/fileScopeTest/simpleFileScope.kt.result
rename to analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.kt.result
diff --git a/analysis/analysis-api/testData/fileScopeTest/simpleFileScope.txt b/analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.txt
similarity index 100%
rename from analysis/analysis-api/testData/fileScopeTest/simpleFileScope.txt
rename to analysis/analysis-api/testData/scopes/fileScopeTest/simpleFileScope.txt
diff --git a/analysis/analysis-api/testData/memberScopeByFqName/Int.kt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.kt
similarity index 100%
rename from analysis/analysis-api/testData/memberScopeByFqName/Int.kt
rename to analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.kt
diff --git a/analysis/analysis-api/testData/memberScopeByFqName/Int.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.txt
similarity index 100%
rename from analysis/analysis-api/testData/memberScopeByFqName/Int.txt
rename to analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.txt
diff --git a/analysis/analysis-api/testData/memberScopeByFqName/MutableList.kt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.kt
similarity index 100%
rename from analysis/analysis-api/testData/memberScopeByFqName/MutableList.kt
rename to analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.kt
diff --git a/analysis/analysis-api/testData/memberScopeByFqName/MutableList.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.txt
similarity index 100%
rename from analysis/analysis-api/testData/memberScopeByFqName/MutableList.txt
rename to analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.txt
diff --git a/analysis/analysis-api/testData/memberScopeByFqName/java.lang.String.kt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.kt
similarity index 100%
rename from analysis/analysis-api/testData/memberScopeByFqName/java.lang.String.kt
rename to analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.kt
diff --git a/analysis/analysis-api/testData/memberScopeByFqName/java.lang.String.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt
similarity index 100%
rename from analysis/analysis-api/testData/memberScopeByFqName/java.lang.String.txt
rename to analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt
diff --git a/analysis/analysis-api/testData/memberScopeByFqName/kotlin.Function2.kt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.kt
similarity index 100%
rename from analysis/analysis-api/testData/memberScopeByFqName/kotlin.Function2.kt
rename to analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.kt
diff --git a/analysis/analysis-api/testData/memberScopeByFqName/kotlin.Function2.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.txt
similarity index 100%
rename from analysis/analysis-api/testData/memberScopeByFqName/kotlin.Function2.txt
rename to analysis/analysis-api/testData/scopes/memberScopeByFqName/kotlin.Function2.txt
diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateAnalysisApiTests.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateAnalysisApiTests.kt
index 7ff5a1e5c0a..d28a5b8fc7e 100644
--- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateAnalysisApiTests.kt
+++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateAnalysisApiTests.kt
@@ -45,11 +45,11 @@ fun main(args: Array<String>) {
             }
 
             testClass<AbstractFirMemberScopeByFqNameTest> {
-                model("memberScopeByFqName")
+                model("scopes/memberScopeByFqName")
             }
 
             testClass<AbstractFirFileScopeTest> {
-                model("fileScopeTest", extension = "kt")
+                model("scopes/fileScopeTest", extension = "kt")
             }
 
             testClass<AbstractFirSymbolByPsiTest> {
@@ -111,11 +111,11 @@ fun main(args: Array<String>) {
 //            }
 
 //            testClass<AbstractKtFe10MemberScopeByFqNameTest> {
-//                model("memberScopeByFqName")
+//                model("scopes/memberScopeByFqName")
 //            }
 
 //            testClass<AbstractKtFe10FileScopeTest> {
-//                model("fileScopeTest", extension = "kt")
+//                model("scopes/fileScopeTest", extension = "kt")
 //            }
 
 //            testClass<AbstractKtFe10SymbolByPsiTest> {