diff --git a/playbooks/tripleo/post.yaml b/playbooks/tripleo/post.yaml
index 0517d8c15..92bb7cfa8 100644
--- a/playbooks/tripleo/post.yaml
+++ b/playbooks/tripleo/post.yaml
@@ -1,10 +1,6 @@
 ---
 
-- hosts: all
+- hosts: primary
   roles:
-    - name: collect tobiko test case results
-      role: tobiko
-      vars:
-        tobiko_pre_run: false
-        tobiko_run: false
-        tobiko_post_run: true
+    - tobiko-zuul
+    - tobiko-post-run
diff --git a/playbooks/tripleo/pre.yaml b/playbooks/tripleo/pre.yaml
index 31122849c..1279e0d5c 100644
--- a/playbooks/tripleo/pre.yaml
+++ b/playbooks/tripleo/pre.yaml
@@ -1,21 +1,12 @@
 ---
 
-- hosts:
-    - primary
-
+- hosts: primary
   roles:
-    - name: install python3-devel and other requirements
-      role: bindep
+    - tobiko-zuul
+    - tobiko-pre-run
 
-    - name: import tripleo-ci common role
+    - name: "import tripleo-ci common role"
       role: common
 
-    - name: install tripleo
+    - name: "install tripleo"
       role: run-test
-
-    - name: prepare environment to run Tobiko test cases
-      role: tobiko
-      vars:
-        tobiko_pre_run: true
-        tobiko_run: false
-        tobiko_post_run: false
diff --git a/playbooks/tripleo/run.yaml b/playbooks/tripleo/run.yaml
index 38c63d5b8..922fa0a66 100644
--- a/playbooks/tripleo/run.yaml
+++ b/playbooks/tripleo/run.yaml
@@ -14,13 +14,7 @@
 
 ---
 
-- hosts:
-    - primary
-
+- hosts: primary
   roles:
-    - name: run Tobiko test cases
-      role: tobiko
-      vars:
-        tobiko_pre_run: false
-        tobiko_run: true
-        tobiko_post_run: false
+    - tobiko-zuul
+    - tobiko-run
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 0c24e8a5a..a11556068 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -22,6 +22,8 @@
         - tobiko-tox-infrared-centos-7
         - tobiko-tox-infrared-centos-8
         - tobiko-tox-infrared-ubuntu-bionic
+        - tobiko-tripleo-functional
+        - tobiko-tripleo-faults
 
     gate:
       jobs:
diff --git a/zuul.d/tobiko-tripleo.yaml b/zuul.d/tripleo.yaml
similarity index 83%
rename from zuul.d/tobiko-tripleo.yaml
rename to zuul.d/tripleo.yaml
index 8551fc309..8c664381f 100644
--- a/zuul.d/tobiko-tripleo.yaml
+++ b/zuul.d/tripleo.yaml
@@ -11,7 +11,7 @@
     run: playbooks/tripleo/run.yaml
     post-run: playbooks/tripleo/post.yaml
     vars:
-      tobiko_conf:
+      test_conf:
         keystone:
           cloud_name: standalone
       featureset: '052'
@@ -48,13 +48,14 @@
           - tripleo-environments
           - x/tobiko
 
+
 - job:
     name: tobiko-tripleo-functional
     description: Functional testing Tobiko TripleO job
     parent: tobiko-tripleo
     voting: false
     vars:
-      tox_envlist: functional
+      test_workflow: functional
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/
@@ -66,31 +67,13 @@
       - ^tobiko/tests/unit/
 
 
-- job:
-    name: tobiko-tripleo-scenario
-    description: Scenario testing Tobiko TripleO job
-    parent: tobiko-tripleo
-    abstract: true
-    vars:
-      tox_envlist: scenario
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^doc/
-      - ^infrared/
-      - ^releasenotes/
-      - ^report/
-      - ^tobiko/tests/faults/
-      - ^tobiko/tests/functional/
-      - ^tobiko/tests/unit/
-
-
 - job:
     name: tobiko-tripleo-faults
     description: OS faults and scenario testing Tobiko TripleO job
-    parent: tobiko-tripleo-scenario
+    parent: tobiko-tripleo
     voting: false
     vars:
-      tobiko_run_faults: true
+      test_workflow: faults
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/