diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2b5613da3..06d2fe22e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -70,14 +70,6 @@ jobs:
             python: pypy3
             arch: x64
 
-            # Currently broken on embed_test
-          - runs-on: windows-latest
-            python: 3.8
-            arch: x64
-          - runs-on: windows-latest
-            python: 3.9
-            arch: x64
-
     name: "🐍 ${{ matrix.python }} • ${{ matrix.runs-on }} • ${{ matrix.arch }} ${{ matrix.args }}"
     runs-on: ${{ matrix.runs-on }}
 
@@ -132,6 +124,8 @@ jobs:
       run: cmake --build . --target pytest -j 2
 
     - name: C++11 tests
+      # TODO: Figure out how to load the DLL on Python 3.8+
+      if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9))"
       run: cmake --build .  --target cpptest -j 2
 
     - name: Interface test C++11
@@ -158,6 +152,8 @@ jobs:
       run: cmake --build build2 --target pytest
 
     - name: C++ tests
+      # TODO: Figure out how to load the DLL on Python 3.8+
+      if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9))"
       run: cmake --build build2 --target cpptest
 
     - name: Interface test
diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index 487d6ffaa..dcf280970 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -90,7 +90,7 @@ In addition, the following changes may be of interest:
   pybind11 will cause pybind11 to use the new Python mechanisms instead of its
   own custom search, based on a patched version of classic ``FindPythonInterp``
   / ``FindPythonLibs``. In the future, this may become the default. A recent
-  (3.15+ or 3.18.2+) version of CMake recommended.
+  (3.15+ or 3.18.2+) version of CMake is recommended.