diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4864723dc..f609ee651 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,8 +1,7 @@
 # Runs CI tests and generates wheels on the following platforms:
-#
-# * Linux (py2 and py3)
-# * macOS (py2 and py3)
-# * Windows (py3, py2 is done by appveyor)
+# * Linux
+# * macOS
+# * Windows
 #
 # Useful URLs:
 # * https://github.com/pypa/cibuildwheel
@@ -16,9 +15,10 @@ concurrency:
   group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) && github.sha || '' }}
   cancel-in-progress: true
 jobs:
-  # Linux + macOS + Windows Python 3
-  py3:
-    name: "py3, ${{ matrix.os }}, ${{ matrix.arch }}"
+
+  # Run tests on Linux, macOS, Windows
+  tests:
+    name: "tests, ${{ matrix.os }}, ${{ matrix.arch }}"
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
     strategy:
@@ -64,7 +64,7 @@ jobs:
     - name: Upload wheels
       uses: actions/upload-artifact@v4
       with:
-        name: wheels-py3-${{ matrix.os }}-${{ matrix.arch }}
+        name: wheels-${{ matrix.os }}-${{ matrix.arch }}
         path: wheelhouse
 
     - name: Generate .tar.gz
@@ -74,8 +74,8 @@ jobs:
         python setup.py sdist
         mv dist/psutil*.tar.gz wheelhouse/
 
-  # Test python 2.7 fallback installation message
-  py2:
+  # Test python 2.7 fallback installation message produced by setup.py
+  py2-fallback:
     name: py2.7 setup.py check
     runs-on: ubuntu-24.04
     timeout-minutes: 20
@@ -101,9 +101,9 @@ jobs:
         python3 -m pip install ruff black rstcheck toml-sort sphinx
         make lint-all
 
-  # upload weels as a single artefact
+  # Produce wheels as artifacts.
   upload-wheels:
-    needs: [py3]
+    needs: [tests]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/upload-artifact/merge@v4