diff --git a/requirements.txt b/requirements.txt
index e2353be..a5b6e46 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,14 +7,10 @@ six>=1.9.0 # MIT
 Babel>=2.3.4 # BSD
 cliff!=1.16.0,!=1.17.0,>=1.15.0 # Apache-2.0
 keystoneauth1>=2.1.0 # Apache-2.0
-openstacksdk>=0.8.5 # Apache-2.0
 os-client-config>=1.13.1 # Apache-2.0
-oslo.config>=3.9.0 # Apache-2.0
 oslo.i18n>=2.1.0 # Apache-2.0
 oslo.utils>=3.5.0 # Apache-2.0
-python-glanceclient>=2.0.0 # Apache-2.0
 python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0
-python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
-python-cinderclient>=1.6.0 # Apache-2.0
 requests!=2.9.0,>=2.8.1 # Apache-2.0
+simplejson>=2.2.0 # MIT
 stevedore>=1.10.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 39d250e..2e63dbf 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -18,17 +18,3 @@ testtools>=1.4.0 # MIT
 tempest>=11.0.0 # Apache-2.0
 osprofiler>=1.3.0 # Apache-2.0
 bandit>=1.0.1 # Apache-2.0
-
-# Install these to generate sphinx autodocs
-python-barbicanclient>=4.0.0 # Apache-2.0
-python-congressclient<2000,>=1.0.0 # Apache-2.0
-python-designateclient>=1.5.0 # Apache-2.0
-python-heatclient>=0.6.0 # Apache-2.0
-python-ironicclient>=1.1.0 # Apache-2.0
-python-ironic-inspector-client>=1.5.0 # Apache-2.0
-python-mistralclient>=1.0.0 # Apache-2.0
-python-muranoclient>=0.8.2 # Apache-2.0
-python-saharaclient>=0.13.0 # Apache-2.0
-python-searchlightclient>=0.2.0 #Apache-2.0
-python-senlinclient>=0.3.0 # Apache-2.0
-python-zaqarclient>=1.0.0 # Apache-2.0