diff --git a/setup.cfg b/setup.cfg
index 8751c38..b845bd5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,8 +7,11 @@ license = Apache License, Version 2.0
 author = OpenStack
 author-email = openstack-discuss@lists.openstack.org
 home-page = https://docs.openstack.org/python-freezerclient/latest/
+python-requires = >=3.6
 classifier =
     Programming Language :: Python
+    Programming Language :: Python :: Implementation :: CPython
+    Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
diff --git a/setup.py b/setup.py
index 566d844..cd35c3c 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>=2.0.0'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index ccec41c..b41f998 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,10 +5,7 @@ flake8<2.6.0,>=2.5.4 # MIT
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 mock>=2.0.0 # BSD
-#pylint==1.9.2 # GPLv2
 stestr>=2.0.0 # Apache-2.0
 testtools>=2.2.0 # MIT
-astroid==1.6.5;python_version<"3.0" # LGPLv2.1
-astroid==2.1.0;python_version>="3.0" # LGPLv2.1
-pylint==1.9.2;python_version<"3.0" # GPLv2
-pylint==2.2.0;python_version>="3.0" # GPLv2
+astroid==2.1.0 # LGPLv2.1
+pylint==2.2.0 # GPLv2