diff --git a/doc/source/contributor/set-up-keystone.rst b/doc/source/contributor/set-up-keystone.rst
index 2f2d4e41f7..eafc563ade 100644
--- a/doc/source/contributor/set-up-keystone.rst
+++ b/doc/source/contributor/set-up-keystone.rst
@@ -26,9 +26,13 @@ Prerequisites
 This document assumes you are using an Ubuntu, Fedora, or openSUSE platform and
 that you have the following tools pre-installed on your system:
 
-- python_ 2.7 and 3.5, as the programming language;
+- python_ 3.6, as the programming language;
 - git_, as the version control tool;
 
+.. NOTE::
+
+    Keystone dropped the support of python_ 2.7 in the Ussuri release of Openstack.
+
 **Reminder**: If you are successfully using a different platform, or a
 different version of the above, please document your configuration here!
 
@@ -136,7 +140,7 @@ Once set up, you should be able to invoke Python and import the libraries:
 
 .. code-block:: bash
 
-    $ .tox/py27/bin/python -c "import keystone"
+    $ .tox/py36/bin/python -c "import keystone"
 
 If you can import keystone without a traceback, you should be ready to move on
 to the next sections.
diff --git a/doc/source/contributor/testing-keystone.rst b/doc/source/contributor/testing-keystone.rst
index 709d56ff8e..4f4bbd2267 100644
--- a/doc/source/contributor/testing-keystone.rst
+++ b/doc/source/contributor/testing-keystone.rst
@@ -52,16 +52,22 @@ other projects.
     your virtualenv in a similar manner.
 
 To run tests for one or more specific test environments (for example, the most
-common configuration of Python 2.7 and PEP-8), list the environments with the
+common configuration of Python 3.6 and PEP-8), list the environments with the
 ``-e`` option, separated by spaces:
 
 .. code-block:: bash
 
-    $ tox -e py27,pep8
+    $ tox -e py36,pep8
+
+.. NOTE::
+
+    Keystone dropped the support of python_ 2.7 in the Ussuri release of Openstack.
 
 Use ``tox --listenvs`` to list all testing environments specified in keystone's
 ``tox.ini`` file.
 
+.. _python: http://www.python.org
+
 Interactive debugging
 ~~~~~~~~~~~~~~~~~~~~~