diff --git a/setup.cfg b/setup.cfg
index 2e3f0a6..3492f05 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,7 +6,7 @@ description-file =
 author = OpenStack
 author-email = openstack-dev@lists.openstack.org
 home-page = http://www.openstack.org/
-python-requires = >=3.6
+python-requires = >=3.8
 classifier =
     Topic :: Utilities
     Intended Audience :: Developers
@@ -14,9 +14,12 @@ classifier =
     Intended Audience :: System Administrators
     License :: OSI Approved :: Apache Software License
     Programming Language :: Python
+    Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
 
 [files]
 packages =
diff --git a/test-requirements.txt b/test-requirements.txt
index e1856b5..3d2e1c5 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,8 +1 @@
-# 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.
-hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
-# remove this pyflakes from here once you bump the
-# hacking to 3.2.0 or above. hacking 3.2.0 takes
-# care of pyflakes version compatibilty.
-pyflakes>=2.1.1
+hacking>=6.1.0,<6.2.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index ba54446..d5ed1a8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 3.1.0
 skipsdist = True
-envlist = pep8,py36
+envlist = pep8,py3
 ignore_basepython_conflict = true
 
 [testenv]