diff --git a/requirements.txt b/requirements.txt
index 1d1fe8eec..7e64ec172 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,6 @@ retrying>=1.2.3,!=1.3.0 # Apache-2.0
 alembic>=0.7.2
 croniter>=0.3.4 # MIT License
 eventlet>=0.16.1
-happybase>=0.5,!=0.7
 iso8601>=0.1.9
 jsonpath-rw>=1.2.0,<2.0
 jsonschema>=2.0.0,<3.0.0
@@ -20,7 +19,6 @@ oslo.concurrency>=1.4.1         # Apache-2.0
 oslo.config>=1.6.0  # Apache-2.0
 oslo.i18n>=1.3.0  # Apache-2.0
 oslo.rootwrap>=1.5.0  # Apache-2.0
-oslo.vmware>=0.9.0                      # Apache-2.0
 PasteDeploy>=1.5.0
 pbr>=0.6,!=0.7,<1.0
 pecan>=0.8.0
diff --git a/test-requirements.txt b/test-requirements.txt
index b5f3d835e..1f1f22c3a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,12 +9,14 @@ coverage>=3.6
 discover
 elasticsearch>=1.3.0
 fixtures>=0.3.14
+happybase>=0.5,!=0.7
 httplib2>=0.7.5
 mock>=1.0
 MySQL-python
 # Docs Requirements
 oslosphinx>=2.2.0  # Apache-2.0
 oslotest>=1.2.0  # Apache-2.0
+oslo.vmware>=0.9.0                      # Apache-2.0
 psycopg2
 pylint>=1.3.0  # GNU GPL v2
 pymongo>=2.5