diff --git a/lower-constraints.txt b/lower-constraints.txt
index cfb0fe3d0c..4a98d3873a 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -62,7 +62,6 @@ python-keystoneclient==2.0.0
 python-mimeparse==1.6.0
 python-subunit==1.2.0
 python-swiftclient==3.2.0
-python-openstackclient==3.12.0
 pytz==2018.3
 PyYAML==3.12
 requests==2.14.2
diff --git a/py2-constraints.txt b/py2-constraints.txt
index 86a5237278..137dc9f8d4 100644
--- a/py2-constraints.txt
+++ b/py2-constraints.txt
@@ -70,3 +70,4 @@ greenlet===0.4.15
 oslo.utils===3.42.1
 gitdb===0.6.4
 gitdb2===2.0.6
+python-keystoneclient===3.22.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 085bd3b0e4..862a0e9219 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,7 +12,6 @@ os-testr>=0.8.0 # Apache-2.0
 mock>=2.0 # BSD
 python-swiftclient>=3.2.0
 python-keystoneclient!=2.1.0,>=2.0.0 # Apache-2.0
-python-openstackclient>=3.12.0
 boto>=2.32.1
 boto3>=1.9
 botocore>=1.12