diff --git a/.zuul.yaml b/.zuul.yaml
index 96fcf961..f8cb2216 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,8 +1,6 @@
 - job:
     name: monascalog-tempest-base
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/monascalog-tempest-base/run.yaml
-    post-run: playbooks/legacy/monascalog-tempest-base/post.yaml
+    parent: devstack-tempest
     timeout: 7800
     required-projects:
       - openstack-infra/devstack-gate
@@ -20,6 +18,13 @@
       - openstack/monasca-log-api
       - openstack/monasca-kibana-plugin
       - openstack/monasca-tempest-plugin
+    vars:
+      tox_envlist: all
+      tempest_test_regex: monasca_tempest_tests.tests.log_api
+      devstack_plugins:
+        monasca-api: git://git.openstack.org/openstack/monasca-api
+        monasca-log-api: git://git.openstack.org/openstack/monasca-log-api
+        monasca-tempest-plugin: git://git.openstack.org/openstack/monasca-tempest-plugin
     irrelevant-files:
       - ^.*\.rst$
       - ^.*\.md$
@@ -29,6 +34,9 @@
 - job:
     name: monascalog-tempest
     parent: monascalog-tempest-base
+    vars:
+      devstack_localrc:
+        TEMPEST_PLUGINS: /opt/stack/monasca-tempest-plugin
 
 - project:
     templates:
diff --git a/playbooks/legacy/monascalog-tempest-base/post.yaml b/playbooks/legacy/monascalog-tempest-base/post.yaml
deleted file mode 100644
index 39e641b1..00000000
--- a/playbooks/legacy/monascalog-tempest-base/post.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-- hosts: primary
-  tasks:
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/logs/**
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
diff --git a/playbooks/legacy/monascalog-tempest-base/run.yaml b/playbooks/legacy/monascalog-tempest-base/run.yaml
deleted file mode 100644
index 777e4d9c..00000000
--- a/playbooks/legacy/monascalog-tempest-base/run.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-- hosts: all
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin monasca-api git://git.openstack.org/openstack/monasca-api
-          enable_plugin monasca-log-api git://git.openstack.org/openstack/monasca-log-api
-          TEMPEST_PLUGINS+='/opt/stack/new/monasca-tempest-plugin'
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-
-          export ENABLED_SERVICES=tempest
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_TEMPEST_REGEX="monasca_tempest_tests.tests.log_api"
-
-          export PROJECTS="openstack/monasca-api $PROJECTS"
-          export PROJECTS="openstack/monasca-persister $PROJECTS"
-          export PROJECTS="openstack/monasca-common $PROJECTS"
-          export PROJECTS="openstack/monasca-agent $PROJECTS"
-          export PROJECTS="openstack/monasca-notification $PROJECTS"
-          export PROJECTS="openstack/monasca-thresh $PROJECTS"
-          export PROJECTS="openstack/monasca-statsd $PROJECTS"
-          export PROJECTS="openstack/python-monascaclient $PROJECTS"
-          export PROJECTS="openstack/monasca-grafana-datasource $PROJECTS"
-          export PROJECTS="openstack/monasca-ui $PROJECTS"
-          export PROJECTS="openstack/monasca-log-api $PROJECTS"
-          export PROJECTS="openstack/monasca-kibana-plugin $PROJECTS"
-          export PROJECTS="openstack/monasca-tempest-plugin $PROJECTS"
-
-          function post_test_hook {
-              source $BASE/new/monasca-log-api/contrib/post_test_hook.sh
-          }
-          export -f post_test_hook
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-