diff --git a/requirements.txt b/requirements.txt
index 65dcb75dc3d..09a4801c604 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -17,7 +17,7 @@ Jinja2>=2.8 # BSD License (3 clause)
 keystonemiddleware!=4.1.0,>=4.0.0 # Apache-2.0
 netaddr!=0.7.16,>=0.7.12 # BSD
 neutron-lib>=0.0.1 # Apache-2.0
-python-neutronclient>=2.6.0 # Apache-2.0
+python-neutronclient!=4.1.0,>=2.6.0 # Apache-2.0
 retrying!=1.3.0,>=1.2.3 # Apache-2.0
 ryu>=3.30 # Apache-2.0
 SQLAlchemy<1.1.0,>=1.0.10 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index abe6023dc34..4fb374a82bb 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,7 +3,7 @@
 # process, which may cause wedges in the gate later.
 hacking<0.11,>=0.10.0
 
-cliff!=1.16.0,>=1.15.0 # Apache-2.0
+cliff!=1.16.0,!=1.17.0,>=1.15.0 # Apache-2.0
 coverage>=3.6 # Apache-2.0
 fixtures>=1.3.1 # Apache-2.0/BSD
 mock>=1.2 # BSD