diff --git a/setup.cfg b/setup.cfg
index e379c22..a5d3beb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -12,6 +12,3 @@ classifier =
     Intended Audience :: System Administrators
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
-
-[wheel]
-universal = 1
diff --git a/setup.py b/setup.py
index 056c16c..f76858d 100644
--- a/setup.py
+++ b/setup.py
@@ -13,17 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# 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'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index ae7d9e3..dcee184 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,9 +2,9 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking>=0.12.0,<0.13 # Apache-2.0
+hacking>=3.0,<3.1 # Apache-2.0
 
 coverage>=4.0,!=4.4 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.6'  # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2'  # BSD
 stestr>=1.0.0 # Apache-2.0
-openstackdocstheme>=1.11.0  # Apache-2.0
+openstackdocstheme>=1.32.1  # Apache-2.0