diff --git a/requirements.txt b/requirements.txt
index f6adfbf0e5..ddd20cc3e7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,3 +4,4 @@ packaging!=20.5,!=20.6,!=20.7,>=16.5 # Apache-2.0
 requests>=2.14.2 # Apache-2.0
 PyYAML>=3.12 # MIT
 beagle>=0.2.1 # Apache-2.0
+setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,>=21.0.0 # PSF/ZPL
diff --git a/test-requirements.txt b/test-requirements.txt
index 3239557c05..bc9ec5a31a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,11 +1,7 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
 # NOTE: These are requirements for testing the requirements project only
 #       See global-requirements for the actual requirements list
 stestr>=1.0.0  # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 virtualenv>=14.0.6 # MIT
-setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,>=21.0.0 # PSF/ZPL
 bashate>=0.5.1 # Apache-2.0