diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..efc0275
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,72 @@
+- job:
+    name: mistral-devstack-tempest-base
+    parent: devstack-tempest
+    pre-run: playbooks/tempest/pre.yaml
+    timeout: 9000
+    required-projects:
+      - openstack-dev/devstack
+      - openstack-infra/devstack-gate
+      - openstack/heat
+      - openstack/mistral
+      - openstack/mistral-lib
+      - openstack/mistral-tempest-plugin
+      - openstack/python-mistralclient
+      - openstack/tempest
+      - openstack/zaqar
+      - openstack/python-zaqarclient
+    vars:
+      tox_envlist: all
+      tempest_test_regex: mistral
+      devstack_localrc:
+        TEMPEST_PLUGINS: "'{{ ansible_user_dir }}/src/git.openstack.org/openstack/mistral-tempest-plugin'"
+        SWIFT_HASH: secrethash
+        MYSQL_ROOT_PW: secretdatabase
+        MISTRAL_USE_MOD_WSGI: True
+        MISTRAL_RPC_IMPLEMENTATION: oslo
+      devstack_services:
+        heat: True
+        h-api: True
+        h-api-cfn: True
+        h-api-cw: True
+        h-eng: True
+        s-proxy: True
+        s-object: True
+        s-container: True
+        s-account: True
+        tempest: True
+      devstack_plugins:
+        mistral: https://git.openstack.org/openstack/mistral
+        heat: https://git.openstack.org/openstack/heat
+        zaqar: https://git.openstack.org/openstack/zaqar
+
+- job:
+    name: mistral-devstack
+    parent: mistral-devstack-tempest-base
+
+- job:
+    name: mistral-devstack-kombu
+    parent: mistral-devstack-tempest-base
+    vars:
+      devstack_localrc:
+        MISTRAL_RPC_IMPLEMENTATION: kombu
+
+- job:
+    name: mistral-devstack-non-apache
+    parent: mistral-devstack-tempest-base
+    vars:
+      devstack_localrc:
+        MISTRAL_USE_MOD_WSGI: False
+
+- project:
+    check:
+      jobs:
+        - mistral-devstack
+        - mistral-devstack-non-apache:
+            branches: ^(?!stable/(newton|ocata)).*$
+        - mistral-devstack-kombu:
+            branches: ^(?!stable/newton).*$
+    gate:
+      jobs:
+        - mistral-devstack
+        - mistral-devstack-non-apache
+        - mistral-devstack-kombu
diff --git a/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_ssh_actions.py b/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_ssh_actions.py
index b83f4a7..ce13a02 100644
--- a/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_ssh_actions.py
+++ b/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_ssh_actions.py
@@ -244,7 +244,7 @@ class SSHActionsTestsV2(base.TestCaseAdvanced):
             'cmd': 'hostname',
             'host': self.public_vm_ip,
             'username': CONF.validation.image_ssh_user,
-            'private_key_filename': self.key_name
+            'private_key_filename': self.key_dir + self.key_name
         }
 
         resp, body = self.client.create_action_execution(
@@ -270,7 +270,7 @@ class SSHActionsTestsV2(base.TestCaseAdvanced):
             'cmd': 'hostname',
             'host': guest_vm_ip,
             'username': CONF.validation.image_ssh_user,
-            'private_key_filename': self.key_name,
+            'private_key_filename': self.key_dir + self.key_name,
             'gateway_host': self.public_vm_ip,
             'gateway_username': CONF.validation.image_ssh_user
         }
diff --git a/playbooks/tempest/pre.yaml b/playbooks/tempest/pre.yaml
new file mode 100644
index 0000000..521d4d3
--- /dev/null
+++ b/playbooks/tempest/pre.yaml
@@ -0,0 +1,10 @@
+- hosts: tempest
+  tasks:
+    - name: Create .ssh dir and make it available to stack and tempest user
+      file:
+        path: /home/tempest/.ssh
+        state: directory
+        mode: u=rwx,g=rwx,o=rx,g+s
+        owner: tempest
+        group: stack
+      become: yes