diff --git a/skills/bmad-module-builder/assets/setup-skill-template/SKILL.md b/skills/bmad-module-builder/assets/setup-skill-template/SKILL.md
index 9134a6d..8837e07 100644
--- a/skills/bmad-module-builder/assets/setup-skill-template/SKILL.md
+++ b/skills/bmad-module-builder/assets/setup-skill-template/SKILL.md
@@ -1,6 +1,6 @@
 ---
-name: { setup-skill-name }
-description: Sets up {module-name} module in a project. Use when the user requests to 'install {module-code} module', 'configure {module-name}', or 'setup {module-name}'.
+name: "{setup-skill-name}"
+description: "Sets up {module-name} module in a project. Use when the user requests to 'install {module-code} module', 'configure {module-name}', or 'setup {module-name}'."
 ---
 
 # Module Setup
diff --git a/skills/bmad-module-builder/scripts/tests/test-scaffold-setup-skill.py b/skills/bmad-module-builder/scripts/tests/test-scaffold-setup-skill.py
index 577ac76..cbd2cff 100644
--- a/skills/bmad-module-builder/scripts/tests/test-scaffold-setup-skill.py
+++ b/skills/bmad-module-builder/scripts/tests/test-scaffold-setup-skill.py
@@ -10,6 +10,8 @@
 import tempfile
 from pathlib import Path
 
+import yaml
+
 SCRIPT = Path(__file__).resolve().parent.parent / "scaffold-setup-skill.py"
 TEMPLATE_DIR = Path(__file__).resolve().parent.parent.parent / "assets" / "setup-skill-template"
 
@@ -94,6 +96,16 @@ def test_skill_md_frontmatter_substitution():
         assert "{module-name}" not in skill_md
         assert "{module-code}" not in skill_md
 
+        frontmatter = skill_md.split("---", 2)[1]
+        parsed = yaml.safe_load(frontmatter)
+        assert parsed["name"] == "bmad-xyz-setup"
+        assert isinstance(parsed["name"], str)
+        assert parsed["description"] == (
+            "Sets up XYZ Studio module in a project. Use when the user requests "
+            "to 'install xyz module', 'configure XYZ Studio', or 'setup XYZ Studio'."
+        )
+        assert isinstance(parsed["description"], str)
+
 
 def test_generated_files_written():
     """Test that module.yaml and module-help.csv contain generated content."""