diff --git a/.zuul.yaml b/.zuul.yaml
index 52a2213c7..955365f3a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -6,13 +6,13 @@
       - release-notes-jobs-python3
     check:
       jobs:
-        - aodh-dsvm-tempest-plugin-mysql
-        - aodh-dsvm-tempest-plugin-postgresql
+        - aodh-tempest-plugin-mysql
+        - aodh-tempest-plugin-postgresql
         - telemetry-dsvm-integration
     gate:
       jobs:
-        - aodh-dsvm-tempest-plugin-mysql
-        - aodh-dsvm-tempest-plugin-postgresql
+        - aodh-tempest-plugin-mysql
+        - aodh-tempest-plugin-postgresql
         - telemetry-dsvm-integration
     experimental:
       jobs:
@@ -33,29 +33,29 @@
         - tripleo-ci-centos-7-scenario002-standalone
 
 - job:
-    name: aodh-dsvm-tempest-plugin-mysql
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/aodh-dsvm-tempest-plugin-mysql/run.yaml
-    post-run: playbooks/legacy/aodh-dsvm-tempest-plugin-mysql/post.yaml
-    timeout: 7800
-    required-projects:
-      - openstack/devstack-gate
-      - openstack/aodh
-      # To install Gnocchi
-      - openstack/ceilometer
-      - openstack/telemetry-tempest-plugin
-      - openstack/tempest
+    name: aodh-tempest-plugin-postgresql
+    parent: telemetry-tempest-base
+    irrelevant-files: &aodh-irrelevant-files
+      - ^(test-|)requirements.txt$
+      - ^setup.cfg$
+      - ^doc/.*$
+      - ^.*\.rst$
+      - ^releasenotes/.*$
+      - ^aodh/tests/.*$
+    vars:
+      devstack_services:
+        postgresql: true
+        mysql: false
+      devstack_localrc:
+        DATABASE_TYPE: "postgresql"
+        AODH_BACKEND: "postgresql"
+      tempest_test_regex: telemetry_tempest_plugin.aodh
 
 - job:
-    name: aodh-dsvm-tempest-plugin-postgresql
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/aodh-dsvm-tempest-plugin-postgresql/run.yaml
-    post-run: playbooks/legacy/aodh-dsvm-tempest-plugin-postgresql/post.yaml
-    timeout: 7800
-    required-projects:
-      - openstack/devstack-gate
-      - openstack/aodh
-      # To install Gnocchi
-      - openstack/ceilometer
-      - openstack/telemetry-tempest-plugin
-      - openstack/tempest
+    name: aodh-tempest-plugin-mysql
+    parent: telemetry-tempest-base
+    irrelevant-files: *aodh-irrelevant-files
+    vars:
+      devstack_localrc:
+        AODH_BACKEND: "mysql"
+      tempest_test_regex: telemetry_tempest_plugin.aodh
diff --git a/playbooks/legacy/aodh-dsvm-tempest-plugin-mysql/post.yaml b/playbooks/legacy/aodh-dsvm-tempest-plugin-mysql/post.yaml
deleted file mode 100644
index dac875340..000000000
--- a/playbooks/legacy/aodh-dsvm-tempest-plugin-mysql/post.yaml
+++ /dev/null
@@ -1,80 +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=**/*nose_results.html
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testr_results.html.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=/.testrepository/tmp*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testrepository.subunit.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}/tox'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/.tox/*/log/*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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/aodh-dsvm-tempest-plugin-mysql/run.yaml b/playbooks/legacy/aodh-dsvm-tempest-plugin-mysql/run.yaml
deleted file mode 100644
index e92c06363..000000000
--- a/playbooks/legacy/aodh-dsvm-tempest-plugin-mysql/run.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-aodh-dsvm-tempest-plugin-mysql from old job gate-aodh-dsvm-tempest-plugin-mysql-ubuntu-xenial
-  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/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://opendev.org \
-              openstack/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 aodh https://opendev.org/openstack/aodh
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_REGEX="telemetry_tempest_plugin.aodh"
-          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
-          export PROJECTS="openstack/aodh openstack/ceilometer openstack/telemetry-tempest-plugin $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin telemetry-tempest-plugin https://opendev.org/openstack/telemetry-tempest-plugin"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer https://opendev.org/openstack/ceilometer"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi"
-          export AODH_BACKEND=mysql
-          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 }}'
diff --git a/playbooks/legacy/aodh-dsvm-tempest-plugin-postgresql/post.yaml b/playbooks/legacy/aodh-dsvm-tempest-plugin-postgresql/post.yaml
deleted file mode 100644
index dac875340..000000000
--- a/playbooks/legacy/aodh-dsvm-tempest-plugin-postgresql/post.yaml
+++ /dev/null
@@ -1,80 +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=**/*nose_results.html
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testr_results.html.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=/.testrepository/tmp*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testrepository.subunit.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}/tox'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/.tox/*/log/*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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/aodh-dsvm-tempest-plugin-postgresql/run.yaml b/playbooks/legacy/aodh-dsvm-tempest-plugin-postgresql/run.yaml
deleted file mode 100644
index 9264ac3d3..000000000
--- a/playbooks/legacy/aodh-dsvm-tempest-plugin-postgresql/run.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-aodh-dsvm-tempest-plugin-postgresql from old job
-    gate-aodh-dsvm-tempest-plugin-postgresql-ubuntu-xenial
-  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/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://opendev.org \
-              openstack/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 aodh https://opendev.org/openstack/aodh
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_REGEX="telemetry_tempest_plugin.aodh"
-          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
-          export PROJECTS="openstack/aodh openstack/ceilometer openstack/telemetry-tempest-plugin $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin telemetry-tempest-plugin https://opendev.org/openstack/telemetry-tempest-plugin"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer https://opendev.org/openstack/ceilometer"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi"
-          export AODH_BACKEND=postgresql
-          export DEVSTACK_GATE_POSTGRES=1
-          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 }}'