diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 08aef91..d174849 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,15 +1,6 @@
-# We from the Oslo project decided to pin repos based on the
-# commit hash instead of the version tag to prevend arbitrary
-# code from running in developer's machines.  To update to a
-# newer version, run `pre-commit autoupdate` and then replace
-# the newer versions with their commit hash.
-
-default_language_version:
-  python: python3
-
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: 9136088a246768144165fcc3ecc3d31bb686920a # v3.3.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       # Replaces or checks mixed line ending
@@ -27,13 +18,8 @@ repos:
       - id: debug-statements
       - id: check-yaml
         files: .*\.(yaml|yml)$
-  - repo: local
+  - repo: https://opendev.org/openstack/hacking
+    rev: 7.0.0
     hooks:
-      - id: flake8
-        name: flake8
-        additional_dependencies:
-          - hacking>=3.0.1,<3.1.0
-        language: python
-        entry: flake8
-        files: '^.*\.py$'
-        exclude: '^(doc|releasenotes|tools)/.*$'
+      - id: hacking
+        additional_dependencies: []
diff --git a/test-requirements.txt b/test-requirements.txt
index bf005dc..7e63541 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,15 +2,12 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking>=3.0.1,<3.1.0 # Apache-2.0
-
 coverage!=4.4,>=4.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
 testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 beautifulsoup4>=4.6.0 # MIT
 stestr>=2.0.0 # Apache-2.0
-pre-commit>=2.6.0 # MIT
 
 # The minimum version requirement is specific to unit tests.
 sphinx>=7.2.0 # BSD
diff --git a/tox.ini b/tox.ini
index 0271057..05968bb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,11 @@ deps =
 commands = stestr run {posargs}
 
 [testenv:pep8]
-commands = pre-commit run -a
+skip_install = true
+deps =
+  pre-commit
+commands =
+  pre-commit run -a
 
 [testenv:venv]
 commands = {posargs}