diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml
index a73ca0b6..ea027e9d 100644
--- a/.github/workflows/pypi-publish.yml
+++ b/.github/workflows/pypi-publish.yml
@@ -11,8 +11,8 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: 3.x
-      - name: Install dependencies
-        run: python -m pip install wheel
+      - name: Install build dependencies
+        run: pip install setuptools wheel
       - name: Build
         run: python setup.py sdist bdist_wheel
       - name: Publish to PyPI
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2b729a57..fcba10b9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,30 +6,31 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', pypy-3.7, pypy-3.8]
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', pypy3.7, pypy3.8]
         exclude:
           - os: windows-latest
-            python-version: pypy-3.7
+            python-version: pypy3.7
           - os: windows-latest
-            python-version: pypy-3.8
+            python-version: pypy3.8
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: python -m pip install tox
-      - name: Run tests
-        run: python -m tox
+      - name: Install test dependencies
+        run: pip install tox
+      - name: Test
+        run: tox
+      - name: Install coveralls
+        if: github.event_name == 'push'
+        run: pip install coveralls
       - name: Upload coverage to Coveralls
         if: github.event_name == 'push'
         env:
           COVERALLS_PARALLEL: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          python -m pip install coveralls
-          python -m coveralls --service=github
+        run: coveralls --service=github
 
   coveralls-finish:
     needs: test
@@ -39,9 +40,9 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: 3.x
+      - name: Install coveralls
+        run: pip install coveralls
       - name: Finish Coveralls parallel builds
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          python -m pip install coveralls
-          python -m coveralls --service=github --finish
+        run: coveralls --service=github --finish