diff --git a/playbooks/pre-tobiko-devstack.yaml b/playbooks/pre-tobiko-devstack.yaml
new file mode 100644
index 000000000..85997798e
--- /dev/null
+++ b/playbooks/pre-tobiko-devstack.yaml
@@ -0,0 +1,29 @@
+---
+
+# devstack copies repos from hardcoded list of organizations only and performa
+# is not there so e.g. os-faults repo can't be copied there easily and we need
+# to do this on our own
+# copied from https://opendev.org/openstack/devstack/src/branch/master/roles/setup-devstack-source-dirs/tasks/main.yaml
+
+- hosts: all
+  tasks:
+    - name: Find source repos from performa organization
+      find:
+        paths:
+          - src/opendev.org/performa
+        file_type: directory
+      register: found_repos
+
+    - name: Copy Zuul repos into devstack working directory
+      command: rsync -a {{ item.path }} /opt/stack
+      with_items: '{{ found_repos.files }}'
+      become: yes
+
+    - name: Set ownership of repos
+      file:
+        path: /opt/stack
+        state: directory
+        recurse: true
+        owner: stack
+        group: stack
+      become: yes
diff --git a/zuul.d/tobiko-devstack.yaml b/zuul.d/tobiko-devstack.yaml
index 40b57c0c4..eb8cc31ec 100644
--- a/zuul.d/tobiko-devstack.yaml
+++ b/zuul.d/tobiko-devstack.yaml
@@ -13,6 +13,7 @@
       - openstack/devstack-gate
       - openstack/heat
       - openstack/neutron
+      - performa/os-faults
       - x/tobiko
     timeout: 7200
     vars:
@@ -26,6 +27,7 @@
       devstack_plugins:
         heat: https://opendev.org/openstack/heat.git
         neutron: https://opendev.org/openstack/neutron.git
+        os-faults: https://opendev.org/performa/os-faults.git
         tobiko: https://opendev.org/x/tobiko.git
       devstack_services:
         heat: true
@@ -80,6 +82,7 @@
         yaml: true
         yml: true
 
+    pre-run: playbooks/pre-tobiko-devstack.yaml
     run: playbooks/tobiko-devstack.yaml
     post-run: playbooks/post-tobiko-devstack.yaml
     irrelevant-files: