diff --git a/requirements.txt b/requirements.txt
index 6e300c2803..0d7aa7093c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,4 +6,4 @@ Parsley>=1.2 # MIT
 six>=1.10.0 # MIT
 packaging>=16.5 # Apache-2.0
 requests>=2.14.2 # Apache-2.0
-PyYAML>=3.10 # MIT
+PyYAML>=3.12 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index ed9cdaf1d7..ca830c2f76 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,7 @@ testrepository>=0.0.18 # Apache-2.0/BSD
 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,>=16.0 # PSF/ZPL
+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
 mock>=2.0.0 # BSD
 bashate>=0.5.1 # Apache-2.0