diff --git a/Makefile b/Makefile
index 18b0e0d..bcb37f2 100644
--- a/Makefile
+++ b/Makefile
@@ -101,10 +101,10 @@ upgrade: $(COMMON_CONSTRAINTS_TXT)	## update the requirements/*.txt files with t
 	pip install -qr requirements/pip-tools.txt
 	pip-compile --upgrade --allow-unsafe --rebuild -o requirements/base.txt requirements/base.in
 	pip-compile --upgrade --allow-unsafe --rebuild -o requirements/test.txt requirements/test.in
-	pip-compile --upgrade -o requirements/doc.txt requirements/doc.in
-	pip-compile --upgrade -o requirements/quality.txt requirements/quality.in
-	pip-compile --upgrade -o requirements/dev.txt requirements/dev.in
-	pip-compile --upgrade -o requirements/production.txt requirements/production.in
+	pip-compile --upgrade --allow-unsafe --rebuild -o  requirements/doc.txt requirements/doc.in
+	pip-compile --upgrade --allow-unsafe --rebuild -o  requirements/quality.txt requirements/quality.in
+	pip-compile --upgrade --allow-unsafe --rebuild -o  requirements/dev.txt requirements/dev.in
+	pip-compile --upgrade --allow-unsafe --rebuild -o requirements/production.txt requirements/production.in
 	# Let tox control the Django version for tests
 	grep -e "^django==" requirements/production.txt > requirements/django.txt
 	sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp
diff --git a/requirements/test.in b/requirements/test.in
index 644e415..4594a0d 100644
--- a/requirements/test.in
+++ b/requirements/test.in
@@ -13,5 +13,4 @@ mock
 pytest
 pytest-cov
 pytest-django
-setuptools
 tox
diff --git a/tox.ini b/tox.ini
index 7c9e8d1..144a537 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,7 +25,6 @@ commands =
 allowlist_externals =
     make
 deps =
-    setuptools
     -r{toxinidir}/requirements/dev.txt
 commands =
     make pii_check
@@ -34,7 +33,6 @@ commands =
 allowlist_externals =
     make
 deps =
-    setuptools
     -r{toxinidir}/requirements/dev.txt
 commands =
     make check_keywords