diff --git a/tox.ini b/tox.ini
index d9bae1d..d9512b8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,6 +16,11 @@ whitelist_externals = find
 [testenv:pep8]
 commands =
     flake8 tripleo_common_tempest_plugin
+    check-uuid --package tripleo_common_tempest_plugin
+
+[testenv:uuidgen]
+commands =
+    check-uuid --package tripleo_common_tempest_plugin --fix
 
 [testenv:venv]
 commands = {posargs}
@@ -28,3 +33,4 @@ enable-extensions=H106,H203
 show-source = true
 exclude=.venv,.git,.tox,*lib/python*,*egg,tools,build,releasenotes
 max-complexity=10
+