diff --git a/.zuul.yaml b/.zuul.yaml
index 49bbc077..4f34ec34 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -11,9 +11,7 @@
 
 - job:
     name: python-troveclient-tempest-neutron-src
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/tempest-dsvm-neutron-src-python-troveclient/run.yaml
-    post-run: playbooks/legacy/tempest-dsvm-neutron-src-python-troveclient/post.yaml
+    parent: devstack-tempest
     timeout: 7800
     required-projects:
       - openstack-dev/devstack
@@ -25,4 +23,10 @@
       - openstack/trove-dashboard
       - openstack/tempest
       - openstack/trove-tempest-plugin
+    vars:
+      tox_envlist: 'full'
+      devstack_localrc:
+        TEMPEST_PLUGINS: '/opt/stack/trove-tempest-plugin'
+      devstack_plugins:
+        trove: git://git.openstack.org/openstack/trove
 
diff --git a/playbooks/legacy/tempest-dsvm-neutron-src-python-troveclient/post.yaml b/playbooks/legacy/tempest-dsvm-neutron-src-python-troveclient/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/tempest-dsvm-neutron-src-python-troveclient/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/tempest-dsvm-neutron-src-python-troveclient/run.yaml b/playbooks/legacy/tempest-dsvm-neutron-src-python-troveclient/run.yaml
deleted file mode 100644
index 985b9e6a..00000000
--- a/playbooks/legacy/tempest-dsvm-neutron-src-python-troveclient/run.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-- hosts: all
-  name: tempest-python-trovelient-neutron-src, copied from
-    old job gate-tempest-dsvm-neutron-src-python-troveclient-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-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 trove git://git.openstack.org/openstack/trove
-          TEMPEST_PLUGINS='/opt/stack/new/trove-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 DEVSTACK_GATE_TROVE=1
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export DEVSTACK_GATE_NEUTRON=1
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export PROJECTS="openstack/trove-dashboard $PROJECTS"
-          export PROJECTS="openstack/trove-tempest-plugin $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
-          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 }}'