diff --git a/tox.ini b/tox.ini
index c9c91ad..d217818 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,7 +20,12 @@
 commands = stestr run --slowest {posargs}
 
 [testenv:pep8]
-commands = flake8 {posargs}
+commands =
+    flake8 {posargs}
+    check-uuid --package cinder_tempest_plugin
+
+[testenv:uuidgen]
+commands = check-uuid --fix --package cinder_tempest_plugin
 
 [testenv:venv]
 commands = {posargs}