diff --git a/.claude/skills/assisted-service-writing-unit-tests.md b/.claude/skills/assisted-service-writing-unit-tests.md
new file mode 120000
index 00000000000..da7d100aa4a
--- /dev/null
+++ b/.claude/skills/assisted-service-writing-unit-tests.md
@@ -0,0 +1 @@
+../../.cursor/skills/assisted-service-writing-unit-tests/SKILL.md
\ No newline at end of file
diff --git a/.cursor/skills/assisted-service-writing-unit-tests/SKILL.md b/.cursor/skills/assisted-service-writing-unit-tests/SKILL.md
new file mode 100644
index 00000000000..7f5fbc900c8
--- /dev/null
+++ b/.cursor/skills/assisted-service-writing-unit-tests/SKILL.md
@@ -0,0 +1,169 @@
+---
+name: assisted-service-writing-unit-tests
+description: Use when writing unit tests in assisted-service with gomock mocks, Ginkgo/Gomega, events, or database. Critical when tests pass but mocks aren't verified, or gomock.NewController appears in code.
+---
+
+# Writing Unit Tests in Assisted-Service
+
+## Overview
+
+Unit tests in assisted-service use Ginkgo/Gomega BDD framework with gomock for mocking. **Core principle: Every gomock controller MUST call `ctrl.Finish()` in `AfterEach` to verify mock expectations.**
+
+Without `ctrl.Finish()`, tests pass even when mocks aren't called correctly - silent failures that hide bugs. Tests run against real PostgreSQL (suite or per-test) with automatic cleanup.
+
+## Quick Reference
+
+| Scenario | Pattern |
+|----------|---------|
+| Testing with mocks | Create controller in `BeforeEach`, call `ctrl.Finish()` in `AfterEach` |
+| Testing without mocks | Use `It()` blocks directly or table-driven tests |
+| Database per test | `PrepareTestDB()` in `BeforeEach`, `DeleteTestDB()` in `AfterEach` |
+| Database for suite | `InitializeDBTest()` in `BeforeSuite`, `TerminateDBTest()` in `AfterSuite` |
+| Event verification | `eventstest.NewEventMatcher` with matchers |
+
+## When to Use Patterns
+
+```dot
+digraph mock_decision {
+    "Testing interface deps?" [shape=diamond];
+    "Need verify calls or control returns?" [shape=diamond];
+    "Use gomock mocks" [shape=box];
+    "Use real implementation" [shape=box];
+
+    "Testing interface deps?" -> "Need verify calls or control returns?" [label="yes"];
+    "Testing interface deps?" -> "Use real implementation" [label="no"];
+    "Need verify calls or control returns?" -> "Use gomock mocks" [label="yes"];
+    "Need verify calls or control returns?" -> "Use real implementation" [label="no"];
+}
+```
+
+```dot
+digraph db_decision {
+    "Tests share data?" [shape=diamond];
+    "Tests modify DB state?" [shape=diamond];
+    "Suite-level DB" [shape=box];
+    "Per-test DB" [shape=box];
+
+    "Tests share data?" -> "Suite-level DB" [label="yes"];
+    "Tests share data?" -> "Tests modify DB state?" [label="no"];
+    "Tests modify DB state?" -> "Per-test DB" [label="yes"];
+    "Tests modify DB state?" -> "Suite-level DB" [label="no"];
+}
+```
+
+## Scope
+
+**Covers:** Unit tests in `internal/` and `pkg/` with gomock, Ginkgo/Gomega, database, events.
+
+**Does NOT cover:** Subsystem tests, E2E, external service integration, performance tests.
+
+**Test files:** `*_test.go` (same package). Suites: `*_suite_test.go`.
+
+## Critical: Gomock Controllers MUST Call Finish()
+
+**Every `Describe`/`Context` creating a gomock controller needs `ctrl.Finish()` in `AfterEach`. No exceptions.**
+
+Without `ctrl.Finish()`:
+- `.Times(N)` - Expected call count NOT checked
+- `.MaxTimes(0)` - Unexpected calls NOT caught
+- `.Do()` / `.DoAndReturn()` - Mock behavior runs without verification
+
+```go
+BeforeEach(func() {
+    ctrl = gomock.NewController(GinkgoT())
+    mockHandler = eventsapi.NewMockHandler(ctrl)
+})
+
+AfterEach(func() {
+    ctrl.Finish()  // REQUIRED - verifies all EXPECT() constraints
+})
+```
+
+**Why this matters:** Missing `ctrl.Finish()` causes silent test failures - tests pass even when mocks aren't called correctly. Real bugs found in commit `338133e05 MGMT-23548`.
+
+**Letter = Spirit:** Following the pattern exactly IS following the spirit. This isn't ritual - it's how gomock verification works.
+
+## Database Setup Patterns
+
+**Suite-level** (shared DB, read-only tests):
+```go
+BeforeSuite(func() { common.InitializeDBTest() })
+AfterSuite(func() { common.TerminateDBTest() })
+```
+
+**Per-test** (isolated DB, tests modify state):
+```go
+BeforeEach(func() { db, dbName = common.PrepareTestDB() })
+AfterEach(func() { common.DeleteTestDB(db, dbName) })
+```
+
+## Event Testing
+
+Use `eventstest.NewEventMatcher` with specific matchers:
+
+```go
+mockEvents.EXPECT().SendHostEvent(gomock.Any(), eventstest.NewEventMatcher(
+    eventstest.WithNameMatcher(eventgen.HostStatusUpdatedEventName),
+    eventstest.WithHostIdMatcher(host.ID.String())))
+```
+
+**Matchers:** `WithNameMatcher`, `WithHostIdMatcher`, `WithClusterIdMatcher`, `WithInfraEnvIdMatcher`, `WithSeverityMatcher`
+
+## Table-Driven Tests
+
+**DescribeTable** (simple cases):
+```go
+DescribeTable("FunctionName",
+    func(input string, valid bool) { /* test logic */ },
+    Entry("descriptive case 1", "value1", true),
+    Entry("descriptive case 2", "value2", false))
+```
+
+**Struct array** (complex scenarios):
+```go
+tests := []struct{name, input string; valid bool}{
+    {name: "case 1", input: "val1", valid: true}}
+for _, t := range tests { It(t.name, func() { /* ... */ }) }
+```
+
+## Test Structure
+
+Ginkgo hierarchy: `Describe("Component")` → `Context("when X")` → `It("should Y")`
+
+**Isolation:** No shared state between `It` blocks. Use `BeforeEach` for setup.
+
+**Gomock matchers:** `.Times(N)`, `.MaxTimes(0)`, `.AnyTimes()`, `gomock.Any()`
+
+## Red Flags - Stop and Fix
+
+These thoughts mean STOP - fix the issue:
+
+- "Tests are passing, mocks must be working" → Add `ctrl.Finish()` in `AfterEach`
+- "Too complex to set up properly" → Follow patterns, don't skip structure
+- "Minimum viable test to satisfy review" → Tests must verify behavior, not theater
+- "I'll add cleanup/verification later" → Do it now, tests will merge broken
+- Code has `gomock.NewController` but no `ctrl.Finish()` → Silent failures
+
+**If you're rationalizing shortcuts due to time pressure, the test will be broken. No exceptions.**
+
+## Common Mistakes
+
+| Mistake | Symptom | Fix |
+|---------|---------|-----|
+| Missing `ctrl.Finish()` | Tests pass when mocks not called | Add `ctrl.Finish()` in `AfterEach` |
+| Shared variables between tests | Flaky tests, race conditions | Move initialization to `BeforeEach` |
+| Missing `GinkgoT()` | Controller doesn't report failures | Use `gomock.NewController(GinkgoT())` |
+| Generic Entry names | "test 1", "test 2" in output | Descriptive: "valid IPv4 CIDR" |
+| Wrong DB pattern | Pollution between tests | Suite-level for reads, per-test for writes |
+| No event matchers | Generic `gomock.Any()` for events | Use `eventstest.NewEventMatcher` with specific matchers |
+
+## Before Submitting
+
+**Check every test file:**
+- [ ] Every `gomock.NewController` has `ctrl.Finish()` in `AfterEach`
+- [ ] No shared state (all setup in `BeforeEach`)
+- [ ] Descriptive names ("valid IPv4 CIDR" not "test 1")
+- [ ] Database cleanup if using `PrepareTestDB()`
+- [ ] Tests pass: `go test -v ./path/to/package`
+
+**Red flags:** Missing `ctrl.Finish()` → silent failures. Shared variables → flaky tests.
diff --git a/CLAUDE.md b/CLAUDE.md
index fb1e43a9911..7083a7b10ec 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -368,6 +368,12 @@ The project has three main test categories:
    - Upstream: [assisted-test-infra](https://github.com/openshift/assisted-test-infra)
    - Downstream: QE maintained tests
 
+### Test Patterns
+
+**When writing unit tests in `internal/` or `pkg/` packages**, reference: `.claude/skills/assisted-service-writing-unit-tests.md`
+
+**Note**: This skill covers unit tests only. Subsystem tests follow different patterns (documented separately).
+
 ### Environment Variables
 
 #### Test Execution