diff --git a/native/native.tests/testData/CExport/kt36639/main-main.out b/native/native.tests/testData/CExport/InterfaceV1/kt36639/main-main.out
similarity index 100%
rename from native/native.tests/testData/CExport/kt36639/main-main.out
rename to native/native.tests/testData/CExport/InterfaceV1/kt36639/main-main.out
diff --git a/native/native.tests/testData/CExport/kt36639/main.c b/native/native.tests/testData/CExport/InterfaceV1/kt36639/main.c
similarity index 100%
rename from native/native.tests/testData/CExport/kt36639/main.c
rename to native/native.tests/testData/CExport/InterfaceV1/kt36639/main.c
diff --git a/native/native.tests/testData/CExport/kt36639/main.kt b/native/native.tests/testData/CExport/InterfaceV1/kt36639/main.kt
similarity index 100%
rename from native/native.tests/testData/CExport/kt36639/main.kt
rename to native/native.tests/testData/CExport/InterfaceV1/kt36639/main.kt
diff --git a/native/native.tests/testData/CExport/smoke0/main.c b/native/native.tests/testData/CExport/InterfaceV1/smoke0/main.c
similarity index 100%
rename from native/native.tests/testData/CExport/smoke0/main.c
rename to native/native.tests/testData/CExport/InterfaceV1/smoke0/main.c
diff --git a/native/native.tests/testData/CExport/smoke0/main.kt b/native/native.tests/testData/CExport/InterfaceV1/smoke0/main.kt
similarity index 100%
rename from native/native.tests/testData/CExport/smoke0/main.kt
rename to native/native.tests/testData/CExport/InterfaceV1/smoke0/main.kt
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportDynamicTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportDynamicTestGenerated.java
index d0b9bed9ab6..41c3ec08aa6 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportDynamicTestGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportDynamicTestGenerated.java
@@ -18,24 +18,24 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("native/native.tests/testData/CExport")
+@TestMetadata("native/native.tests/testData/CExport/InterfaceV1")
 @TestDataPath("$PROJECT_ROOT")
 @EnforcedProperty(property = ClassLevelProperty.BINARY_LIBRARY_KIND, propertyValue = "DYNAMIC")
 public class CExportDynamicTestGenerated extends AbstractNativeCExportTest {
-  @Test
-  public void testAllFilesPresentInCExport() {
-    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport"), Pattern.compile("^([^_](.+))$"), null, false);
-  }
+    @Test
+    public void testAllFilesPresentInInterfaceV1() {
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport/InterfaceV1"), Pattern.compile("^([^_](.+))$"), null, false);
+    }
 
-  @Test
-  @TestMetadata("kt36639")
-  public void testKt36639() {
-    runTest("native/native.tests/testData/CExport/kt36639/");
-  }
+    @Test
+    @TestMetadata("kt36639")
+    public void testKt36639() {
+        runTest("native/native.tests/testData/CExport/InterfaceV1/kt36639/");
+    }
 
-  @Test
-  @TestMetadata("smoke0")
-  public void testSmoke0() {
-    runTest("native/native.tests/testData/CExport/smoke0/");
-  }
+    @Test
+    @TestMetadata("smoke0")
+    public void testSmoke0() {
+        runTest("native/native.tests/testData/CExport/InterfaceV1/smoke0/");
+    }
 }
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportStaticTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportStaticTestGenerated.java
index 56a092892a0..702acccee99 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportStaticTestGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CExportStaticTestGenerated.java
@@ -18,24 +18,24 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("native/native.tests/testData/CExport")
+@TestMetadata("native/native.tests/testData/CExport/InterfaceV1")
 @TestDataPath("$PROJECT_ROOT")
 @EnforcedProperty(property = ClassLevelProperty.BINARY_LIBRARY_KIND, propertyValue = "STATIC")
 public class CExportStaticTestGenerated extends AbstractNativeCExportTest {
-  @Test
-  public void testAllFilesPresentInCExport() {
-    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport"), Pattern.compile("^([^_](.+))$"), null, false);
-  }
+    @Test
+    public void testAllFilesPresentInInterfaceV1() {
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport/InterfaceV1"), Pattern.compile("^([^_](.+))$"), null, false);
+    }
 
-  @Test
-  @TestMetadata("kt36639")
-  public void testKt36639() {
-    runTest("native/native.tests/testData/CExport/kt36639/");
-  }
+    @Test
+    @TestMetadata("kt36639")
+    public void testKt36639() {
+        runTest("native/native.tests/testData/CExport/InterfaceV1/kt36639/");
+    }
 
-  @Test
-  @TestMetadata("smoke0")
-  public void testSmoke0() {
-    runTest("native/native.tests/testData/CExport/smoke0/");
-  }
+    @Test
+    @TestMetadata("smoke0")
+    public void testSmoke0() {
+        runTest("native/native.tests/testData/CExport/InterfaceV1/smoke0/");
+    }
 }
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportDynamicTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportDynamicTestGenerated.java
index 09d39906fa9..943205c11e5 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportDynamicTestGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportDynamicTestGenerated.java
@@ -20,26 +20,26 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("native/native.tests/testData/CExport")
+@TestMetadata("native/native.tests/testData/CExport/InterfaceV1")
 @TestDataPath("$PROJECT_ROOT")
 @EnforcedProperty(property = ClassLevelProperty.BINARY_LIBRARY_KIND, propertyValue = "DYNAMIC")
 @Tag("frontend-fir")
 @FirPipeline()
 public class FirCExportDynamicTestGenerated extends AbstractNativeCExportTest {
-  @Test
-  public void testAllFilesPresentInCExport() throws Exception {
-    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport"), Pattern.compile("^([^_](.+))$"), null, false);
-  }
+    @Test
+    public void testAllFilesPresentInInterfaceV1() {
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport/InterfaceV1"), Pattern.compile("^([^_](.+))$"), null, false);
+    }
 
-  @Test
-  @TestMetadata("kt36639")
-  public void testKt36639() {
-    runTest("native/native.tests/testData/CExport/kt36639/");
-  }
+    @Test
+    @TestMetadata("kt36639")
+    public void testKt36639() {
+        runTest("native/native.tests/testData/CExport/InterfaceV1/kt36639/");
+    }
 
-  @Test
-  @TestMetadata("smoke0")
-  public void testSmoke0() {
-    runTest("native/native.tests/testData/CExport/smoke0/");
-  }
+    @Test
+    @TestMetadata("smoke0")
+    public void testSmoke0() {
+        runTest("native/native.tests/testData/CExport/InterfaceV1/smoke0/");
+    }
 }
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportStaticTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportStaticTestGenerated.java
index 921d9d55519..aaafea014b9 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportStaticTestGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirCExportStaticTestGenerated.java
@@ -20,25 +20,26 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("native/native.tests/testData/CExport")
+@TestMetadata("native/native.tests/testData/CExport/InterfaceV1")
 @TestDataPath("$PROJECT_ROOT")
+@EnforcedProperty(property = ClassLevelProperty.BINARY_LIBRARY_KIND, propertyValue = "STATIC")
 @Tag("frontend-fir")
 @FirPipeline()
 public class FirCExportStaticTestGenerated extends AbstractNativeCExportTest {
-  @Test
-  public void testAllFilesPresentInCExport() throws Exception {
-    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport"), Pattern.compile("^([^_](.+))$"), null, false);
-  }
+    @Test
+    public void testAllFilesPresentInInterfaceV1() {
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/CExport/InterfaceV1"), Pattern.compile("^([^_](.+))$"), null, false);
+    }
 
-  @Test
-  @TestMetadata("kt36639")
-  public void testKt36639() {
-    runTest("native/native.tests/testData/CExport/kt36639/");
-  }
+    @Test
+    @TestMetadata("kt36639")
+    public void testKt36639() {
+        runTest("native/native.tests/testData/CExport/InterfaceV1/kt36639/");
+    }
 
-  @Test
-  @TestMetadata("smoke0")
-  public void testSmoke0() {
-    runTest("native/native.tests/testData/CExport/smoke0/");
-  }
+    @Test
+    @TestMetadata("smoke0")
+    public void testSmoke0() {
+        runTest("native/native.tests/testData/CExport/InterfaceV1/smoke0/");
+    }
 }
diff --git a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt
index f54e76838d1..0439282a158 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt
@@ -480,7 +480,7 @@ fun main() {
                             *frontend.value
                         )
                     ) {
-                        model("CExport", pattern = "^([^_](.+))$", recursive = false)
+                        model("CExport/InterfaceV1", pattern = "^([^_](.+))$", recursive = false)
                     }
                 }
             }