diff --git a/.zuul.yaml b/.zuul.yaml
index b628c82fb..c436f2bac 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,8 +1,6 @@
 - job:
     name: monasca-tempest-base
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/monasca-tempest-base/run.yaml
-    post-run: playbooks/legacy/monasca-tempest-base/post.yaml
+    parent: devstack-tempest
     timeout: 7800
     required-projects:
       - openstack-infra/devstack-gate
@@ -18,8 +16,13 @@
       - openstack/python-monascaclient
       - openstack/tempest
       - openstack/monasca-tempest-plugin
+
     vars:
-      database: mysql
+      tox_envlist: all
+      tempest_test_regex: monasca_tempest_tests.tests.api
+      devstack_plugins:
+        monasca-api: git://git.openstack.org/openstack/monasca-api
+        monasca-tempest-plugin: git://git.openstack.org/openstack/monasca-tempest-plugin
     irrelevant-files:
       - ^.*\.rst$
       - ^.*\.md$
@@ -30,33 +33,42 @@
     name: monasca-tempest-python-influxdb
     parent: monasca-tempest-base
     vars:
-      tsdb: influxdb
-      api_lang: python
-      persister_lang: python
+      devstack_localrc:
+        MONASCA_API_IMPLEMENTATION_LANG: python
+        MONASCA_PERSISTER_IMPLEMENTATION_LANG: python
+        MONASCA_METRICS_DB: influxdb
+        TEMPEST_PLUGINS: /opt/stack/monasca-tempest-plugin
 
 - job:
     name: monasca-tempest-java-influxdb
     parent: monasca-tempest-base
+    voting: false
     vars:
-      tsdb: influxdb
-      api_lang: java
-      persister_lang: java
+      devstack_localrc:
+        MONASCA_API_IMPLEMENTATION_LANG: python
+        MONASCA_PERSISTER_IMPLEMENTATION_LANG: java
+        MONASCA_METRICS_DB: influxdb
+        TEMPEST_PLUGINS: /opt/stack/monasca-tempest-plugin
 
 - job:
     name: monasca-tempest-python-cassandra
     parent: monasca-tempest-base
     vars:
-      tsdb: cassandra
-      api_lang: python
-      persister_lang: python
+      devstack_localrc:
+        MONASCA_API_IMPLEMENTATION_LANG: python
+        MONASCA_PERSISTER_IMPLEMENTATION_LANG: python
+        MONASCA_METRICS_DB: cassandra
+        TEMPEST_PLUGINS: /opt/stack/monasca-tempest-plugin
 
 - job:
     name: monasca-tempest-java-cassandra
     parent: monasca-tempest-base
     vars:
-      tsdb: cassandra
-      api_lang: python
-      persister_lang: java
+      devstack_localrc:
+        MONASCA_API_IMPLEMENTATION_LANG: python
+        MONASCA_PERSISTER_IMPLEMENTATION_LANG: java
+        MONASCA_METRICS_DB: cassandra
+        TEMPEST_PLUGINS: /opt/stack/monasca-tempest-plugin
 
 - project:
     templates:
diff --git a/devstack/lib/persister.sh b/devstack/lib/persister.sh
index 7bad49533..405ed1d6e 100644
--- a/devstack/lib/persister.sh
+++ b/devstack/lib/persister.sh
@@ -223,7 +223,6 @@ configure_monasca_persister_python() {
     fi
 
     ln -sf ${MONASCA_PERSISTER_CONF} ${MONASCA_PERSISTER_GATE_CONFIG}
-    ln -sf ${MONASCA_PERSISTER_LOGGING_CONF} ${MONASCA_PERSISTER_GATE_CONFIG}
 }
 
 clean_monasca_persister_python() {
diff --git a/playbooks/legacy/monasca-tempest-base/post.yaml b/playbooks/legacy/monasca-tempest-base/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/legacy/monasca-tempest-base/post.yaml
+++ /dev/null
@@ -1,15 +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/monasca-tempest-base/run.yaml b/playbooks/legacy/monasca-tempest-base/run.yaml
deleted file mode 100644
index cfffbd17c..000000000
--- a/playbooks/legacy/monasca-tempest-base/run.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-tempest-dsvm-monasca-python-mysql-full from old job
-    gate-tempest-dsvm-monasca-python-mysql-full-ubuntu-xenial-nv
-  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
-          MONASCA_API_IMPLEMENTATION_LANG="{{ api_lang }}"
-          MONASCA_PERSISTER_IMPLEMENTATION_LANG="{{ persister_lang }}"
-          MONASCA_METRICS_DB="{{ tsdb }}"
-          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_EXERCISES=0
-          export DEVSTACK_GATE_TEMPEST=1
-           export DEVSTACK_GATE_TEMPEST_REGEX="monasca_tempest_tests.tests.api"
-
-          if [ "{{ database }}" == "postgresql" ]; then
-              export DEVSTACK_GATE_POSTGRES=1
-          else
-              export DEVSTACK_GATE_POSTGRES=0
-          fi
-
-          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-tempest-plugin $PROJECTS"
-
-          function post_test_hook {
-              # Configure and run tempest on monasca-api installation
-              source $BASE/new/monasca-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 }}'