diff --git a/requirements.txt b/requirements.txt
index a9c23bb..3a1ae93 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,6 +4,5 @@
 
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 
-sphinx>=1.8.0,<2.0.0;python_version=='2.7' # BSD
-sphinx>=1.8.0,!=2.1.0;python_version>='3.4'  # BSD
+sphinx>=1.8.0,!=2.1.0 # BSD
 openstackdocstheme>=1.30.0 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index e30a29e..ddf6bf0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -10,9 +10,3 @@ classifier =
     Intended Audience :: Developers
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
-
-[pbr]
-warnerrors = True
-
-[wheel]
-universal = 1