diff --git a/requirements.txt b/requirements.txt
index 043bb259..7e8be5b1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,6 @@
 deepdiff==3.3.0
 gitpython
 grpcio==1.16.0
-grpcio-tools==1.16.0
 jsonschema>=2.6.0
 keystoneauth1==2.21.0
 keystonemiddleware==4.9.1
diff --git a/test-requirements.txt b/test-requirements.txt
index 0f49ac07..20fa1b0f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -14,3 +14,5 @@ flake8>=3.3.0
 mock
 responses>=0.8.1
 yapf
+
+grpcio-tools==1.16.0