diff --git a/octavia_tempest_plugin/tests/api/v2/test_load_balancer.py b/octavia_tempest_plugin/tests/api/v2/test_load_balancer.py
index 684eddb5..0cf35769 100644
--- a/octavia_tempest_plugin/tests/api/v2/test_load_balancer.py
+++ b/octavia_tempest_plugin/tests/api/v2/test_load_balancer.py
@@ -197,7 +197,7 @@ class LoadBalancerAPITest(test_base.LoadBalancerBaseTest):
             CONF.load_balancer.lb_build_interval,
             CONF.load_balancer.lb_build_timeout)
 
-    @decorators.idempotent_id('643ef031-c800-45f2-b229-3c8f8b37c829')
+    @decorators.idempotent_id('abd784e3-485f-442a-85da-d91365c6b5dd')
     def test_load_balancer_delete_cascade(self):
         """Tests load balancer create and cascade delete APIs.
 
diff --git a/octavia_tempest_plugin/tests/scenario/v2/test_member.py b/octavia_tempest_plugin/tests/scenario/v2/test_member.py
index 37648ce6..153cfd52 100644
--- a/octavia_tempest_plugin/tests/scenario/v2/test_member.py
+++ b/octavia_tempest_plugin/tests/scenario/v2/test_member.py
@@ -671,7 +671,7 @@ class MemberScenarioTest(test_base.LoadBalancerBaseTest):
             const.TCP, const.TCP, const.LB_ALGORITHM_ROUND_ROBIN)
         self._test_mixed_member_create(pool_id)
 
-    @decorators.idempotent_id('0623aa1f-753d-44e7-afa1-017d274eace7')
+    @decorators.idempotent_id('e74b28cf-ab1a-423b-a1c5-d940e3c0a5ab')
     @testtools.skipUnless(CONF.load_balancer.test_with_ipv6,
                           'IPv6 testing is disabled')
     # Skipping test for amphora driver until "UDP load balancers cannot mix
diff --git a/tox.ini b/tox.ini
index 8854d214..86d81b12 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,12 @@ commands =
   stestr slowest
 
 [testenv:pep8]
-commands = flake8
+commands =
+  flake8
+  check-uuid --package octavia_tempest_plugin
+
+[testenv:uuidgen]
+commands = check-uuid --fix --package octavia_tempest_plugin
 
 [testenv:venv]
 commands = {posargs}