diff --git a/roles/tobiko-run/vars/test-workflow-gate.yaml b/roles/tobiko-run/vars/test-workflow-gate.yaml
index 6672ce763..8d3d0ea57 100644
--- a/roles/tobiko-run/vars/test-workflow-gate.yaml
+++ b/roles/tobiko-run/vars/test-workflow-gate.yaml
@@ -4,33 +4,37 @@ test_workflow_steps:
   - tox_description: 'run unit test cases'
     tox_envlist: py3
     tox_step_name: unit
-    tox_environment:
-      TOX_RERUNS: 0
 
   - tox_description: 'run functional test cases'
     tox_envlist: functional
     tox_step_name: functional
-    tox_environment:
-      TOX_RERUNS: 2
-      TOX_RERUNS_DELAY: 60
 
   - tox_description: 'create workload resources'
     tox_envlist: scenario
     tox_step_name: create_resources
     tox_environment:
-      TOX_RERUNS: 2
-      TOX_RERUNS_DELAY: 60
+      TOBIKO_PREVENT_CREATE: no
+
+  - tox_description: 'run sanity test cases before disruptive test cases'
+    tox_envlist: sanity
+    tox_step_name: before_faults
+    tox_environment:
+      TOBIKO_PREVENT_CREATE: no
 
   - tox_description: 'run disruptive test cases'
     tox_envlist: faults
     tox_step_name: faults
     tox_environment:
-      TOX_RERUNS: 0
+      TOBIKO_PREVENT_CREATE: no
+
+  - tox_description: 'run sanity test cases after disruptive test cases'
+    tox_envlist: sanity
+    tox_step_name: after_faults
+    tox_environment:
+      TOBIKO_PREVENT_CREATE: no
 
   - tox_description: 'verify workload resources'
     tox_envlist: scenario
     tox_step_name: verify_resources
     tox_environment:
       TOBIKO_PREVENT_CREATE: yes
-      TOX_RERUNS: 2
-      TOX_RERUNS_DELAY: 60