diff --git a/README.rst b/README.rst
index f74795a..3e49092 100644
--- a/README.rst
+++ b/README.rst
@@ -149,6 +149,5 @@ There are multiple test targets that can be run to validate the code.
 
 * tox -e pep8 - style guidelines enforcement
 * tox -e py27 - traditional unit testing with python 2.7
-* tox -e py35 - traditional unit testing with python 3.5
 * tox -e py36 - traditional unit testing with python 3.6
 * tox -e py37 - traditional unit testing with python 3.7
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 8871238..8b11e59 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,5 +1,7 @@
 # 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.18.1 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7'  # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4'  # BSD
diff --git a/doc/source/man/openstack.rst b/doc/source/man/openstack.rst
index 4fd3dbe..30723f0 100644
--- a/doc/source/man/openstack.rst
+++ b/doc/source/man/openstack.rst
@@ -4,4 +4,4 @@ openstack
 
 Please refer to OpenStack command-line interface `OpenStackClient`_.
 
-.. _OpenStackClient: http://docs.openstack.org/cli-reference/openstack.html
+.. _OpenStackClient: https://docs.openstack.org/python-openstackclient/latest/
diff --git a/tox.ini b/tox.ini
index 9aac394..e8d1fe1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@ skipsdist = True
 usedevelop = True
 install_command = pip install {opts} {packages}
 deps =
-       -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
+       -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands =
@@ -18,7 +18,7 @@ whitelist_externals = find
 [testenv:pypy]
 basepython = python3
 deps =
-       -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
+       -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
  setuptools<3.2
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt