diff --git a/han-coding/docs/skills/manual-test-planning.md b/han-coding/docs/skills/manual-test-planning.md
index 533c3ff..2262981 100644
--- a/han-coding/docs/skills/manual-test-planning.md
+++ b/han-coding/docs/skills/manual-test-planning.md
@@ -25,6 +25,10 @@ and _how_ to use the skill. For what the skill does internally, read the skill d
   change code, and the result is directly observable. Internal refactors and dependency bumps do not qualify.
 - **One test per outcome, grouped only on identical steps.** A test verifies a single outcome, or a group of related
   outcomes only when the exact same steps produce every outcome in the group. Different steps means a different test.
+- **Categories for larger plans.** When the plan holds more than five tests, the skill looks for natural
+  plain-language categories among them. When at least two emerge, both the test list and the detail sections are
+  organized under the category names, and any test that fits no category goes under a final "Other tests" category.
+  With one natural category or none, the flat list stays.
 - **No manual tests means no document.** When the supplied context has nothing a person can test by hand, the skill
   says so and asks whether there is more context to consider. If there is none, its only output is that statement.
 - **Plain language throughout.** The plan is written for the person running the tests, who may not be technical. No
@@ -79,6 +83,10 @@ A `manual-test-plan.md` file with three sections:
 - **Test Details.** One section per named test: what it verifies, a numbered list of steps to follow by hand, and the
   expected outcome or outcomes the person should observe.
 
+When the plan holds more than five tests and at least two natural categories emerge, both Tests at a Glance and Test
+Details are organized under plain-language category names, with the same categories in the same order in both
+sections and any uncategorized test under a final "Other tests" category.
+
 When nothing in the context can be manually tested and you have no more context to add, there is no file; the skill
 tells you that in the channel and stops.
 
@@ -108,7 +116,9 @@ The skill walks a seven-step process:
 2. **Identify what can be manually tested.** List candidate outcomes a person can verify by hand. If the list is
    empty, say so and ask for more context; with none, stop with no document.
 3. **Group outcomes into named tests.** One outcome per test, merged only when the exact same steps produce every
-   outcome in the group, each with a short plain-language name.
+   outcome in the group, each with a short plain-language name. When there are more than five tests, the skill looks
+   for natural plain-language categories; when at least two emerge, the plan is organized under them with any
+   uncategorized test under a final "Other tests" category, and otherwise the flat list stays.
 4. **Draft the plan.** Source the shared readability standard via `han-communication:readability-guidance`, then fill
    the template at [`references/template.md`](../../skills/manual-test-planning/references/template.md).
 5. **Adversarially validate the plan.** Dispatch `adversarial-validator` against the draft with the context it was
diff --git a/han-coding/skills/manual-test-planning/SKILL.md b/han-coding/skills/manual-test-planning/SKILL.md
index 298c708..1d6ddcc 100644
--- a/han-coding/skills/manual-test-planning/SKILL.md
+++ b/han-coding/skills/manual-test-planning/SKILL.md
@@ -4,7 +4,9 @@ description: >
   Produce a plain-language manual test plan from the context supplied to it — an executive summary, a high-level list
   of named tests, and a detail section per test with the steps a person follows by hand and the outcomes they should
   expect. Use when you want to create, draft, generate, or outline a manual test plan, manual QA steps, hands-on
-  verification steps, or an acceptance walkthrough for a feature, change, branch, plan, or PR. When nothing in the
+  verification steps, or an acceptance walkthrough for a feature, change, branch, plan, or PR. When the plan holds
+  more than five tests and at least two natural categories emerge, both the test list and the detail sections are
+  organized under plain-language categories. When nothing in the
   supplied context can be manually tested, it says so and asks for more context instead of producing a document. Does
   not analyze code for automated test coverage gaps — use automated-test-planning. Does not write test code — use tdd. Does not
   review code quality — use code-review. Does not stress-test an existing plan — use iterative-plan-review.
@@ -77,6 +79,14 @@ Turn the outcomes into a list of named tests:
    wrong password"), not how.
 4. Order the tests in the sequence a person would sensibly run them: tests that set up state other tests rely on come
    first, then the most important behaviors, then the rest.
+5. Count the tests. When there are more than 5, look for natural plain-language categories among them — by the area
+   of the product they exercise, the kind of person who runs them, or the feature they verify. When at least two
+   natural categories emerge, categorize: assign each test to exactly one category, name each category with the same
+   short plain-language rule as test names, and put every test that fits no natural category under a final category
+   named "Other tests". Keep the run order: categories in the order their first test would run, "Other tests" last,
+   and tests in run order within each category. When only one natural category emerges, or none do, keep the flat
+   list, BECAUSE a single category or a forced grouping adds structure without helping the tester see how the tests
+   relate. With 5 tests or fewer, always keep the flat list.
 
 ## Step 4: Draft the Plan
 
@@ -89,6 +99,11 @@ draft the document using the template at [references/template.md](./references/t
 - **Test Details** — one section per named test: one sentence on what it verifies, a numbered list of steps to follow,
   and the expected outcome or outcomes.
 
+When Step 3 produced categories, organize both Tests at a Glance and Test Details under the category names, following
+the categorized layout in the template: each category is a heading in both sections, its tests sit beneath it, and the
+categories and tests appear in the same order in both sections, BECAUSE the reader jumps between the glance list and
+the details by matching names.
+
 Apply the Operating Principles as you write: short sentences, plain words, no technical detail, expected outcomes in
 every detail section.
 
@@ -135,7 +150,7 @@ overwriting discards a document you did not produce in this run.
 Dispatch `han-communication:readability-editor` (one Agent call) to audit and rewrite the plan's prose against the
 readability standard. Pass it the file path and the named audience: the person who will run these tests by hand, who
 may not be technical. The editor reads han-communication's own canonical rule, so pass no rule path. It must preserve
-every fact — every step, expected outcome, and test name must survive with its meaning intact.
+every fact — every step, expected outcome, test name, and category name must survive with its meaning intact.
 
 Then run the standardized readability self-check (the shared standard is in your context from
 `han-communication:readability-guidance`) over the document. Confirm each criterion and fix any failure:
@@ -147,6 +162,8 @@ Then run the standardized readability self-check (the shared standard is in your
 5. No word from the vocabulary blocklist (the writing-voice profile's "Avoided words and phrases" and "AI slop to
    avoid" lists) is present.
 6. Every test still has its steps and expected outcomes, and no technical detail has crept in.
+7. When the plan uses categories, Tests at a Glance and Test Details still carry the same category names in the same
+   order, with every test under its category in both sections.
 
 Finish by presenting a short in-channel summary: the file path, the number of tests, and the test names. Do not
 repeat the full document in the channel.
diff --git a/han-coding/skills/manual-test-planning/references/template.md b/han-coding/skills/manual-test-planning/references/template.md
index 7a4e3a2..39339d7 100644
--- a/han-coding/skills/manual-test-planning/references/template.md
+++ b/han-coding/skills/manual-test-planning/references/template.md
@@ -14,9 +14,25 @@
 <!-- test name in bold, then one short sentence on what it verifies. Each name must match -->
 <!-- its heading in Test Details exactly, so the reader can jump between them. -->
 
+<!-- Flat layout (the plan has no categories): -->
+
+- **{Test name}** — {one short sentence on what this test verifies}
+- **{Test name}** — {...}
+
+<!-- Categorized layout (the plan has categories): replace the flat list with one heading -->
+<!-- per category, its tests listed beneath it. Category names and their order must match -->
+<!-- Test Details exactly. Tests that fit no natural category sit under a final category -->
+<!-- named "Other tests". -->
+
+### {Category name}
+
 - **{Test name}** — {one short sentence on what this test verifies}
 - **{Test name}** — {...}
 
+### {Category name}
+
+- **{Test name}** — {...}
+
 ## Test Details
 
 <!-- One section per named test, in the same order as Tests at a Glance. Each section has: -->
@@ -26,6 +42,10 @@
 <!-- outcome in the group. Every step is an action the person takes through the product's -->
 <!-- own surfaces. Every expected outcome is something the person can see and check. -->
 
+<!-- Flat layout: each test is a level-three heading, as shown below. Categorized layout: -->
+<!-- each category is a level-three heading and each of its tests is a level-four heading -->
+<!-- beneath it, with the same one-sentence, Steps, and Expected outcomes structure. -->
+
 ### {Test name}
 
 {One short sentence on what this test verifies.}