diff --git a/setup.cfg b/setup.cfg
index 6e03960..4e81b86 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -40,12 +40,3 @@ openstack.observabilityclient.v1 =
     metric_delete = observabilityclient.v1.cli:Delete
     metric_clean-tombstones = observabilityclient.v1.cli:CleanTombstones
     metric_snapshot = observabilityclient.v1.cli:Snapshot
-
-
-[flake8]
-show-source = True
-builtins = _
-exclude =
-    .venv,
-    .git,
-    dist
diff --git a/tox.ini b/tox.ini
index ec7296b..b77b5c3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,7 +22,7 @@ commands = stestr run --slowest {posargs} --test-path {env:OS_TEST_PATH}
 
 [testenv:pep8]
 basepython = python3
-deps = hacking<3.1.0,>=3.0
+deps = hacking>=7.0.0,<7.1.0
 commands = flake8
 
 [testenv:venv]
@@ -62,7 +62,7 @@ show-source = True
 # W503 line break before binary operator
 # W504 line break after binary operator
 ignore = A002,A003,D100,D101,D102,D103,D104,D105,D106,D107,W503,W504
-exclude=.venv,.git,.tox,dist,doc,*egg,build
+exclude = .venv,.git,.tox,dist,doc,*egg,build,*lib/python*
 # [H101] Include your name with TODOs as in # TODO(yourname).
 # [H104] Empty files should not contain license or comments
 # [H106] Do not put vim configuration in source files.