diff --git a/docs/modules/bmm-bmad-method/quick-start.md b/docs/modules/bmm-bmad-method/quick-start.md
index 78143418..9358ba15 100644
--- a/docs/modules/bmm-bmad-method/quick-start.md
+++ b/docs/modules/bmm-bmad-method/quick-start.md
@@ -221,7 +221,14 @@ Once planning and architecture are complete, you'll move to Phase 4. **Important
 3. Tell the agent: "Run dev-story"
 4. The DEV agent will implement the story and update the sprint status
 
-#### 3.4 Review the Code (Optional but Recommended)
+#### 3.4 Generate Guardrail Tests (Optional)
+
+1. **Start a new chat** with the **TEA agent**
+2. Wait for the menu
+3. Tell the agent: "Run automate"
+4. The TEA agent generates or expands tests to act as guardrails
+
+#### 3.5 Review the Code (Optional but Recommended)
 
 1. **Start a new chat** with the **DEV agent**
 2. Wait for the menu
@@ -234,7 +241,8 @@ For each subsequent story, repeat the cycle using **fresh chats** for each workf
 
 1. **New chat** → SM agent → "Run create-story"
 2. **New chat** → DEV agent → "Run dev-story"
-3. **New chat** → DEV agent → "Run code-review" (optional but recommended)
+3. **New chat** → TEA agent → "Run automate" (optional)
+4. **New chat** → DEV agent → "Run code-review" (optional but recommended)
 
 After completing all stories in an epic:
 
diff --git a/docs/modules/bmm-bmad-method/workflows-implementation.md b/docs/modules/bmm-bmad-method/workflows-implementation.md
index 73dfa432..02d9c471 100644
--- a/docs/modules/bmm-bmad-method/workflows-implementation.md
+++ b/docs/modules/bmm-bmad-method/workflows-implementation.md
@@ -98,8 +98,9 @@ Stories move through these states in the sprint status file:
 
 1. SM runs `create-story`
 2. DEV runs `dev-story`
-3. DEV runs `code-review`
-4. If code review fails: DEV fixes issues in `dev-story`, then re-runs `code-review`
+3. (Optional) TEA runs `*automate` to generate or expand guardrail tests
+4. DEV runs `code-review`
+5. If code review fails: DEV fixes issues in `dev-story`, then re-runs `code-review`
 
 **After Epic Complete:**
 
diff --git a/src/modules/bmm/workflows/4-implementation/create-story/instructions.xml b/src/modules/bmm/workflows/4-implementation/create-story/instructions.xml
index 52405e71..701b438e 100644
--- a/src/modules/bmm/workflows/4-implementation/create-story/instructions.xml
+++ b/src/modules/bmm/workflows/4-implementation/create-story/instructions.xml
@@ -336,9 +336,10 @@
       1. Review the comprehensive story in {{story_file}}
       2. Run dev agents `dev-story` for optimized implementation
       3. Run `code-review` when complete (auto-marks done)
+      4. Optional: Run TEA `*automate` after `dev-story` to generate guardrail tests
 
       **The developer now has everything needed for flawless implementation!**
     </output>
   </step>
 
-</workflow>
\ No newline at end of file
+</workflow>
diff --git a/src/modules/bmm/workflows/4-implementation/dev-story/instructions.xml b/src/modules/bmm/workflows/4-implementation/dev-story/instructions.xml
index 40c56244..4fb70efe 100644
--- a/src/modules/bmm/workflows/4-implementation/dev-story/instructions.xml
+++ b/src/modules/bmm/workflows/4-implementation/dev-story/instructions.xml
@@ -397,6 +397,7 @@
       - Verify all acceptance criteria are met
       - Ensure deployment readiness if applicable
       - Run `code-review` workflow for peer review
+      - Optional: Run TEA `*automate` to expand guardrail tests
     </action>
 
     <output>💡 **Tip:** For best results, run `code-review` using a **different** LLM than the one that implemented this story.</output>
@@ -406,4 +407,4 @@
     <action>Remain flexible - allow user to choose their own path or ask for other assistance</action>
   </step>
 
-</workflow>
\ No newline at end of file
+</workflow>