diff --git a/tools/hacking/__init__.py b/tempest/hacking/__init__.py
similarity index 100%
rename from tools/hacking/__init__.py
rename to tempest/hacking/__init__.py
diff --git a/tools/hacking/tempest.py b/tempest/hacking/checks.py
similarity index 95%
rename from tools/hacking/tempest.py
rename to tempest/hacking/checks.py
index 1db8419..1e70108 100644
--- a/tools/hacking/tempest.py
+++ b/tempest/hacking/checks.py
@@ -40,3 +40,7 @@
 
         if bug_re.match(physical_line) is None:
             return (pos, 'T102: Bug number formatted incorrectly')
+
+
+def factory(register):
+    register(skip_bugs)
diff --git a/tools/__init__.py b/tools/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/tools/__init__.py
+++ /dev/null
diff --git a/tox.ini b/tox.ini
index d6c2c41..924e844 100644
--- a/tox.ini
+++ b/tox.ini
@@ -60,7 +60,7 @@
        -r{toxinidir}/tools/test-requires
 
 [hacking]
-local-check = tools.hacking.tempest.skip_bugs
+local-check-factory = tempest.hacking.checks.factory
 
 [flake8]
 ignore = E125,H302,H404