diff --git a/tests/skills/README.md b/tests/skills/README.md
index 9714a68e..43bc3ddf 100644
--- a/tests/skills/README.md
+++ b/tests/skills/README.md
@@ -111,7 +111,7 @@ Exit code: 0 = все прошли, 1 = есть падения.
 
 ## Эталоны (snapshots)
 
-Эталон — директория `<имя-кейса>.snapshot/` рядом с `.json` файлом кейса. Содержит ожидаемый выход навыка после нормализации.
+Эталон — директория `snapshots/<имя-кейса>/` внутри папки навыка. Содержит ожидаемый выход навыка после нормализации.
 
 ### Создание / обновление эталонов
 
@@ -144,5 +144,6 @@ tests/skills/
     <навык>/
       _skill.json         # конфиг навыка
       <кейс>.json         # тестовый случай
-      <кейс>.snapshot/    # эталон
+      snapshots/
+        <кейс>/           # эталон
 ```
diff --git a/tests/skills/cases/meta-compile/catalog-basic.snapshot/Catalogs/Валюты.xml b/tests/skills/cases/meta-compile/snapshots/catalog-basic/Catalogs/Валюты.xml
similarity index 100%
rename from tests/skills/cases/meta-compile/catalog-basic.snapshot/Catalogs/Валюты.xml
rename to tests/skills/cases/meta-compile/snapshots/catalog-basic/Catalogs/Валюты.xml
diff --git a/tests/skills/cases/meta-compile/catalog-basic.snapshot/Catalogs/Валюты/Ext/ObjectModule.bsl b/tests/skills/cases/meta-compile/snapshots/catalog-basic/Catalogs/Валюты/Ext/ObjectModule.bsl
similarity index 100%
rename from tests/skills/cases/meta-compile/catalog-basic.snapshot/Catalogs/Валюты/Ext/ObjectModule.bsl
rename to tests/skills/cases/meta-compile/snapshots/catalog-basic/Catalogs/Валюты/Ext/ObjectModule.bsl
diff --git a/tests/skills/cases/meta-compile/catalog-basic.snapshot/Configuration.xml b/tests/skills/cases/meta-compile/snapshots/catalog-basic/Configuration.xml
similarity index 100%
rename from tests/skills/cases/meta-compile/catalog-basic.snapshot/Configuration.xml
rename to tests/skills/cases/meta-compile/snapshots/catalog-basic/Configuration.xml
diff --git a/tests/skills/cases/meta-compile/catalog-basic.snapshot/Languages/Русский.xml b/tests/skills/cases/meta-compile/snapshots/catalog-basic/Languages/Русский.xml
similarity index 100%
rename from tests/skills/cases/meta-compile/catalog-basic.snapshot/Languages/Русский.xml
rename to tests/skills/cases/meta-compile/snapshots/catalog-basic/Languages/Русский.xml
diff --git a/tests/skills/cases/meta-compile/catalog-tabparts.snapshot/Catalogs/Товары.xml b/tests/skills/cases/meta-compile/snapshots/catalog-tabparts/Catalogs/Товары.xml
similarity index 100%
rename from tests/skills/cases/meta-compile/catalog-tabparts.snapshot/Catalogs/Товары.xml
rename to tests/skills/cases/meta-compile/snapshots/catalog-tabparts/Catalogs/Товары.xml
diff --git a/tests/skills/cases/meta-compile/catalog-tabparts.snapshot/Catalogs/Товары/Ext/ObjectModule.bsl b/tests/skills/cases/meta-compile/snapshots/catalog-tabparts/Catalogs/Товары/Ext/ObjectModule.bsl
similarity index 100%
rename from tests/skills/cases/meta-compile/catalog-tabparts.snapshot/Catalogs/Товары/Ext/ObjectModule.bsl
rename to tests/skills/cases/meta-compile/snapshots/catalog-tabparts/Catalogs/Товары/Ext/ObjectModule.bsl
diff --git a/tests/skills/cases/meta-compile/catalog-tabparts.snapshot/Configuration.xml b/tests/skills/cases/meta-compile/snapshots/catalog-tabparts/Configuration.xml
similarity index 100%
rename from tests/skills/cases/meta-compile/catalog-tabparts.snapshot/Configuration.xml
rename to tests/skills/cases/meta-compile/snapshots/catalog-tabparts/Configuration.xml
diff --git a/tests/skills/cases/meta-compile/catalog-tabparts.snapshot/Languages/Русский.xml b/tests/skills/cases/meta-compile/snapshots/catalog-tabparts/Languages/Русский.xml
similarity index 100%
rename from tests/skills/cases/meta-compile/catalog-tabparts.snapshot/Languages/Русский.xml
rename to tests/skills/cases/meta-compile/snapshots/catalog-tabparts/Languages/Русский.xml
diff --git a/tests/skills/cases/meta-compile/document-basic.snapshot/Configuration.xml b/tests/skills/cases/meta-compile/snapshots/document-basic/Configuration.xml
similarity index 100%
rename from tests/skills/cases/meta-compile/document-basic.snapshot/Configuration.xml
rename to tests/skills/cases/meta-compile/snapshots/document-basic/Configuration.xml
diff --git a/tests/skills/cases/meta-compile/document-basic.snapshot/Documents/ПриходнаяНакладная.xml b/tests/skills/cases/meta-compile/snapshots/document-basic/Documents/ПриходнаяНакладная.xml
similarity index 100%
rename from tests/skills/cases/meta-compile/document-basic.snapshot/Documents/ПриходнаяНакладная.xml
rename to tests/skills/cases/meta-compile/snapshots/document-basic/Documents/ПриходнаяНакладная.xml
diff --git a/tests/skills/cases/meta-compile/document-basic.snapshot/Documents/ПриходнаяНакладная/Ext/ObjectModule.bsl b/tests/skills/cases/meta-compile/snapshots/document-basic/Documents/ПриходнаяНакладная/Ext/ObjectModule.bsl
similarity index 100%
rename from tests/skills/cases/meta-compile/document-basic.snapshot/Documents/ПриходнаяНакладная/Ext/ObjectModule.bsl
rename to tests/skills/cases/meta-compile/snapshots/document-basic/Documents/ПриходнаяНакладная/Ext/ObjectModule.bsl
diff --git a/tests/skills/cases/meta-compile/document-basic.snapshot/Languages/Русский.xml b/tests/skills/cases/meta-compile/snapshots/document-basic/Languages/Русский.xml
similarity index 100%
rename from tests/skills/cases/meta-compile/document-basic.snapshot/Languages/Русский.xml
rename to tests/skills/cases/meta-compile/snapshots/document-basic/Languages/Русский.xml
diff --git a/tests/skills/cases/meta-compile/enum.snapshot/Configuration.xml b/tests/skills/cases/meta-compile/snapshots/enum/Configuration.xml
similarity index 100%
rename from tests/skills/cases/meta-compile/enum.snapshot/Configuration.xml
rename to tests/skills/cases/meta-compile/snapshots/enum/Configuration.xml
diff --git a/tests/skills/cases/meta-compile/enum.snapshot/Enums/ВидыНоменклатуры.xml b/tests/skills/cases/meta-compile/snapshots/enum/Enums/ВидыНоменклатуры.xml
similarity index 100%
rename from tests/skills/cases/meta-compile/enum.snapshot/Enums/ВидыНоменклатуры.xml
rename to tests/skills/cases/meta-compile/snapshots/enum/Enums/ВидыНоменклатуры.xml
diff --git a/tests/skills/cases/meta-compile/enum.snapshot/Languages/Русский.xml b/tests/skills/cases/meta-compile/snapshots/enum/Languages/Русский.xml
similarity index 100%
rename from tests/skills/cases/meta-compile/enum.snapshot/Languages/Русский.xml
rename to tests/skills/cases/meta-compile/snapshots/enum/Languages/Русский.xml
diff --git a/tests/skills/runner.mjs b/tests/skills/runner.mjs
index 980d8135..efbfa8a5 100644
--- a/tests/skills/runner.mjs
+++ b/tests/skills/runner.mjs
@@ -60,7 +60,7 @@ function discoverCases(filter) {
 
       const casePath = join(skillPath, file);
       const caseData = JSON.parse(readFileSync(casePath, 'utf8'));
-      const snapshotDir = join(skillPath, `${caseName}.snapshot`);
+      const snapshotDir = join(skillPath, 'snapshots', caseName);
 
       results.push({
         id: caseId,