diff --git a/doc/requirements.txt b/doc/requirements.txt
index 26903a56bf..cbd4cc9ebb 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,8 +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.
-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,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
+sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD
 os-api-ref>=1.4.0 # Apache-2.0
 openstackdocstheme>=1.20.0 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 762c18e53d..d186b68849 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -30,9 +30,6 @@
 import os
 import sys
 
-import openstackdocstheme
-
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -187,7 +184,6 @@ html_theme = 'openstackdocs'
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = ['_theme']
-html_theme_path = [openstackdocstheme.get_html_theme_path()]
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
diff --git a/setup.cfg b/setup.cfg
index d71a6aa722..404eef8140 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,6 +6,7 @@ description-file =
 author = OpenStack
 author-email = openstack-discuss@lists.openstack.org
 home-page = https://docs.openstack.org/glance/latest/
+python-requires = >=3.6
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
diff --git a/setup.py b/setup.py
index 566d84432e..f63cc23c52 100644
--- a/setup.py
+++ b/setup.py
@@ -16,14 +16,6 @@
 # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
-# In python < 2.7.4, a lazy loading of package `pbr` will break
-# setuptools if some other modules registered functions in `atexit`.
-# solution from: http://bugs.python.org/issue15881#msg170215
-try:
-    import multiprocessing  # noqa
-except ImportError:
-    pass
-
 setuptools.setup(
     setup_requires=['pbr>=2.0.0'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index d064ee1bed..d4478ece00 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,8 +13,6 @@ coverage!=4.4,>=4.0 # Apache-2.0
 ddt>=1.0.1 # MIT
 fixtures>=3.0.0 # Apache-2.0/BSD
 mock>=2.0.0 # 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,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
 requests>=2.14.2 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testresources>=2.0.0 # Apache-2.0/BSD
@@ -24,6 +22,7 @@ psutil>=3.2.2 # BSD
 oslotest>=3.2.0 # Apache-2.0
 stestr>=2.0.0 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0
+Pygments>=2.2.0  # BSD license
 
 # Optional packages that should be installed when testing
 PyMySQL>=0.7.6 # MIT License
diff --git a/tox.ini b/tox.ini
index 55e933b43b..0ac852fecd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -81,9 +81,6 @@ commands =
 [testenv:pep8]
 commands =
   flake8 {posargs}
-  # Run security linter
-  # Check that .po and .pot files are valid:
-  bash -c "find glance -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null"
   doc8 {posargs}
 
 [testenv:genconfig]