diff --git a/gbpclient/gbp/v2_0/groupbasedpolicy.py b/gbpclient/gbp/v2_0/groupbasedpolicy.py
index 8dbbe28..560b25a 100644
--- a/gbpclient/gbp/v2_0/groupbasedpolicy.py
+++ b/gbpclient/gbp/v2_0/groupbasedpolicy.py
@@ -14,8 +14,8 @@
 import argparse
 import logging
 
+from neutronclient._i18n import _
 from neutronclient.common import utils as n_utils
-from neutronclient.i18n import _
 from neutronclient.neutron import v2_0 as neutronV20
 from neutronclient.v2_0 import client as neutron_client
 from oslo_serialization import jsonutils
diff --git a/gbpclient/gbp/v2_0/servicechain.py b/gbpclient/gbp/v2_0/servicechain.py
index 5f566ff..f6b88f7 100644
--- a/gbpclient/gbp/v2_0/servicechain.py
+++ b/gbpclient/gbp/v2_0/servicechain.py
@@ -20,9 +20,9 @@ import os
 
 from heatclient.common import template_utils
 
+from neutronclient._i18n import _
 from neutronclient.common import exceptions as exc
 from neutronclient.common import utils as n_utils
-from neutronclient.i18n import _
 from neutronclient.neutron import v2_0 as neutronV20
 
 from gbpclient.common import utils
diff --git a/gbpclient/gbpshell.py b/gbpclient/gbpshell.py
index d11c541..eadeb3d 100644
--- a/gbpclient/gbpshell.py
+++ b/gbpclient/gbpshell.py
@@ -32,10 +32,10 @@ import six.moves.urllib.parse as urlparse
 
 from cliff import app
 from cliff import commandmanager
+from neutronclient._i18n import _
 from neutronclient.common import clientmanager
 from neutronclient.common import exceptions as exc
 from neutronclient.common import utils
-from neutronclient.i18n import _
 from neutronclient.version import __version__
 
 from gbpclient.gbp.v2_0 import groupbasedpolicy as gbp
diff --git a/requirements.txt b/requirements.txt
index 1b3412c..585e429 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,8 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-pbr>=1.6 # Apache-2.0
-python-heatclient>=0.8.0
-python-neutronclient<6.0.0,>=5.1.0
+pbr>=1.8 # Apache-2.0
+python-heatclient>=1.6.1
+python-neutronclient<6.3.0,>=5.1.0
 oslo.serialization>=1.10.0 # Apache-2.0
-oslo.utils>=3.5.0 # Apache-2.0
-# REVISIT: After mitaka release add dependency on released version of python-neutronclient
+oslo.utils>=3.18.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 9536df2..dff6d90 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,16 +3,18 @@
 # process, which may cause wedges in the gate later.
 hacking<0.11,>=0.10.0
 
-cliff-tablib>=1.0
-coverage>=3.6 # Apache-2.0
-fixtures>=1.3.1 # Apache-2.0/BSD
+coverage>=4.0 # Apache-2.0
+fixtures>=3.0.0 # Apache-2.0/BSD
+mox3!=0.19.0,>=0.7.0 # Apache-2.0
+mock>=2.0 # BSD
 httpretty>=0.8.0,!=0.8.1,!=0.8.2,!=0.8.3
-mox3>=0.7.0 # Apache-2.0
-oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
+oslosphinx>=4.7.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
-python-keystoneclient<=3.2.0
+python-openstackclient>=3.3.0 # Apache-2.0
 python-subunit>=0.0.18 # Apache-2.0/BSD
-requests-mock>=0.7.0 # Apache-2.0
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
+reno>=1.8.0 # Apache-2.0
+requests-mock>=1.1 # Apache-2.0
+sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
 testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
+testscenarios>=0.4 # Apache-2.0/BSD
diff --git a/tox.ini b/tox.ini
index 8c3730d..eeec5b6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,7 +26,7 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
 
 [testenv:docs]
 commands=
-    python setup.py build_sphinx
+    sphinx-build -W -b html doc/source doc/build/html
 
 [flake8]
 # E125 continuation line does not distinguish itself from next logical line