diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5798d6a..57f07a6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -48,9 +48,10 @@ jobs:
           cache: 'pip'
           cache-dependency-path: 'setup.py'
 
-      - name: Install program
+      - name: Setup Project
         run: |
-          pip install --editable=.[test]
+          pip install pip 'setuptools>=64' --upgrade
+          pip install --editable='.[test]'
 
       - name: Run tests
         run: |
diff --git a/Makefile b/Makefile
index 2a1b4ba..555d139 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,7 @@ $(eval isort        := $(venvpath)/bin/isort)
 # Setup Python virtualenv
 setup-virtualenv:
 	@test -e $(python) || python3 -m venv $(venvpath)
+	@(pip) install --upgrade setuptools
 
 
 # -------