diff --git a/.ci/install.sh b/.ci/install.sh
index bbdb2013e..486ac3a34 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -33,7 +33,8 @@ pip install pyroma
 pip install test-image-results
 pip install numpy
 
-# TODO Remove when 3.9 includes setuptools 49.3.2+:
+# TODO Remove when 3.8 / 3.9 includes setuptools 49.3.2+:
+if [ "$GHA_PYTHON_VERSION" == "3.8" ]; then pip install -U "setuptools>=49.3.2" ; fi
 if [ "$GHA_PYTHON_VERSION" == "3.9" ]; then pip install -U "setuptools>=49.3.2" ; fi
 
 if [[ $TRAVIS_PYTHON_VERSION == 3.* ]]; then
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index a8ca613b7..0964ee504 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -63,9 +63,9 @@ jobs:
     - name: pip install wheel pytest pytest-cov
       run: python -m pip install wheel pytest pytest-cov
 
-    # TODO Remove when 3.9 includes setuptools 49.3.2+:
+    # TODO Remove when 3.8 / 3.9 includes setuptools 49.3.2+:
     - name: Upgrade setuptools
-      if: "contains(matrix.python-version, '3.9')"
+      if: "contains(matrix.python-version, '3.8') || contains(matrix.python-version, '3.9')"
       run: python -m pip install -U "setuptools>=49.3.2"
 
     - name: Install dependencies