diff --git a/babel.cfg b/babel.cfg
deleted file mode 100644
index efceab81..00000000
--- a/babel.cfg
+++ /dev/null
@@ -1 +0,0 @@
-[python: **.py]
diff --git a/doc/requirements.txt b/doc/requirements.txt
index db8055d6..272828f9 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,6 +1,6 @@
 # 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.
-openstackdocstheme>=1.20.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.0.0 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 1170f095..4747a7d0 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -39,7 +39,7 @@ munch==2.1.0
 murano-pkg-check==0.3.0
 netaddr==0.7.18
 netifaces==0.10.4
-openstackdocstheme==1.20.0
+openstackdocstheme==2.0.0
 openstacksdk==0.11.2
 os-client-config==1.28.0
 os-service-types==1.2.0
@@ -82,7 +82,7 @@ rfc3986==0.3.1
 semantic-version==2.3.1
 simplejson==3.5.1
 snowballstemmer==1.2.1
-Sphinx==1.6.2
+Sphinx==2.0.0
 sphinxcontrib-websupport==1.0.1
 stevedore==1.20.0
 tempest==17.1.0
diff --git a/setup.cfg b/setup.cfg
index 9a614c86..6dd36670 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -67,22 +67,3 @@ openstack.application_catalog.v1 =
 
     static-action_call = muranoclient.osc.v1.action:StaticActionCall
     class-schema = muranoclient.osc.v1.schema:ShowSchema
-
-[egg_info]
-tag_build =
-tag_date = 0
-tag_svn_revision = 0
-
-[compile_catalog]
-directory = muranoclient/locale
-domain = muranoclient
-
-[update_catalog]
-domain = muranoclient
-output_dir = muranoclient/locale
-input_file = muranoclient/locale/muranoclient.pot
-
-[extract_messages]
-keywords = _ gettext ngettext l_ lazy_gettext
-mapping_file = babel.cfg
-output_file = muranoclient/locale/muranoclient.pot
diff --git a/tox.ini b/tox.ini
index fcb2bf96..508e557c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,11 +9,10 @@ basepython = python3
 usedevelop = True
 whitelist_externals = bash
                       find
-install_command = pip install {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
 passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
@@ -21,13 +20,6 @@ commands = stestr run {posargs}
 [testenv:pep8]
 commands = flake8 {posargs}
 
-[testenv:py27-queens]
-basepython = python2.7
-install_command = pip install {opts} {packages}
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
-       -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/queens}
-
 [testenv:venv]
 commands = {posargs}
 
@@ -56,13 +48,13 @@ commands =
 
 [testenv:pyflakes]
 deps =
- -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
  flake8
 commands = flake8
 
 [testenv:docs]
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/doc/requirements.txt
 commands =
@@ -70,7 +62,7 @@ commands =
 
 [testenv:releasenotes]
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html