diff --git a/tox.ini b/tox.ini
index 4812539..6e73414 100755
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py37,pep8
+envlist = py3,py37,py38,py39,py310,linters
 skipsdist = True
 sitepackages = False
 skip_missing_interpreters = True
@@ -21,14 +21,17 @@
     pip install {opts} {packages}
 
 
-[testenv:py3]
+[testenv:{py3,py37,py38,py39,py310}]
 basepython = python3
 deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
-[testenv:pep8]
-commands =   
-    flake8
+[testenv:linters]
+skipsdist = True
+deps =
+  pre-commit
+commands =
+  pre-commit run --all-files --show-diff-on-failure
 
 [testenv:cover]
 basepython = python3
@@ -48,11 +51,3 @@
 
 [testenv:venv]
 commands = {posargs}
-
-[flake8]
-# E123, E125 skipped as they are invalid PEP-8.
-
-show-source = True
-ignore = E123,E125
-builtins = _
-exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build