diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index eb240c30..983188f2 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -3,7 +3,11 @@ name: CI
 on:
   pull_request:
   push:
-    branches: [main]
+    branches: [main, 'release/**']
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 permissions:
   contents: read
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index 7b98ef95..00000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Tests
-
-on:
-  push:
-    branches:
-      - main
-      - 'release/**'
-  pull_request:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
-jobs:
-  test:
-    name: Run on Ubuntu
-    runs-on: ubuntu-latest
-    steps:
-      - name: Clone the code
-        uses: actions/checkout@v7
-
-      - name: Setup Go
-        uses: actions/setup-go@v7
-        with:
-          go-version: '1.27'
-
-      - name: Running Tests
-        run: |
-          go mod tidy
-          make test
diff --git a/CLAUDE.md b/CLAUDE.md
index 2b456088..87a38a63 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -168,7 +168,8 @@ Operator deployment config is composed from Kustomize bases and overlays under
 
 ### CI
 GitHub Actions enforce the same commands locally available:
-`make test` (test.yml), the `test-infra` e2e env (test-e2e.yml, via
+the unit and envtest suite (ci.yaml; `make test` locally), the `test-infra`
+e2e env (test-e2e.yml, via
 `task test-infra:up` + `task test-infra:test-e2e`), `golangci-lint`
 (lint.yml), and kustomize validation (validate-kustomize.yaml). Run them
 locally before pushing.