diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index eac409f0..aa71c1bf 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -59,6 +59,13 @@ jobs:
           python-version-file: "pyproject.toml"
       - name: Install dependencies
         run: uv sync --all-extras
+      - name: Cache HuggingFace models
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/huggingface
+          key: huggingface-${{ runner.os }}-qwen-tokenizer-v1
+      - name: Pre-download tokenizer
+        run: uv run python -c "from transformers import AutoTokenizer; AutoTokenizer.from_pretrained('Qwen/Qwen3-Embedding-0.6B')"
       - name: Run tests with coverage
         run: uv run pytest -m "not integration" --cov=haiku --cov-report=xml
       - name: Upload coverage to Codecov
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e75adc5..db43526e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 ## [Unreleased]
 
+### Fixed
+
+- **CI**: Cache HuggingFace tokenizer to prevent flaky test failures when HuggingFace has transient outages
+
 ## [0.28.0] - 2026-01-31
 
 ### Changed