diff --git a/roles/tobiko-run/tasks/main.yaml b/roles/tobiko-run/tasks/main.yaml
index f616cb954..b145ecc2c 100644
--- a/roles/tobiko-run/tasks/main.yaml
+++ b/roles/tobiko-run/tasks/main.yaml
@@ -1,7 +1,7 @@
 ---
 
 - name: "include test workflow steps for name '{{ test_workflow }}'"
-  include_vars: "{{ test_workflow }}.yaml"
+  include_vars: "test-workflow-{{ test_workflow }}.yaml"
 
 
 - name: "show test workflow steps"
diff --git a/roles/tobiko-run/vars/default.yaml b/roles/tobiko-run/vars/test-workflow-default.yaml
similarity index 100%
rename from roles/tobiko-run/vars/default.yaml
rename to roles/tobiko-run/vars/test-workflow-default.yaml
diff --git a/roles/tobiko-run/vars/test-workflow-faults-neutron.yaml b/roles/tobiko-run/vars/test-workflow-faults-neutron.yaml
new file mode 100644
index 000000000..635cd3a5e
--- /dev/null
+++ b/roles/tobiko-run/vars/test-workflow-faults-neutron.yaml
@@ -0,0 +1,18 @@
+---
+
+test_workflow_steps:
+  - tox_description: 'create workload resources'
+    tox_envlist: neutron
+    tox_step_name: create_resources
+    tox_environment:
+      TOBIKO_PREVENT_CREATE: no
+
+  - tox_description: 'run disruptive test cases'
+    tox_envlist: faults
+    tox_step_name: faults
+
+  - tox_description: 'verify workload resources'
+    tox_envlist: neutron
+    tox_step_name: verify_resources'
+    tox_environment:
+      TOBIKO_PREVENT_CREATE: yes
diff --git a/roles/tobiko-run/vars/faults.yaml b/roles/tobiko-run/vars/test-workflow-faults.yaml
similarity index 100%
rename from roles/tobiko-run/vars/faults.yaml
rename to roles/tobiko-run/vars/test-workflow-faults.yaml
diff --git a/roles/tobiko-run/vars/functional.yaml b/roles/tobiko-run/vars/test-workflow-functional.yaml
similarity index 100%
rename from roles/tobiko-run/vars/functional.yaml
rename to roles/tobiko-run/vars/test-workflow-functional.yaml
diff --git a/roles/tobiko-run/vars/unit.yaml b/roles/tobiko-run/vars/test-workflow-unit.yaml
similarity index 100%
rename from roles/tobiko-run/vars/unit.yaml
rename to roles/tobiko-run/vars/test-workflow-unit.yaml