diff --git a/.zuul.yaml b/.zuul.yaml
index cbfb64f..78767db 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,20 +3,16 @@
       - build-openstack-docs-pti
       - check-requirements
       - openstack-python-jobs
-      - openstack-python3-train-jobs
+      - openstack-python3-train-jobs-neutron
     check:
       jobs:
         - neutron-classifier-tox-lower-constraints
-        - neutron-classifier-functional-dsvm:
-            required-projects:
-              - openstack/neutron
+        - neutron-classifier-functional:
+            voting: false
     gate:
       queue: neutron-classifier
       jobs:
         - neutron-classifier-tox-lower-constraints
-        - neutron-classifier-functional-dsvm:
-            required-projects:
-              - openstack/neutron
 
 - job:
     name: neutron-classifier-tox-lower-constraints
@@ -25,30 +21,19 @@
       - openstack/neutron
 
 - job:
-    name: neutron-classifier-functional-dsvm
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/neutron-classifier-functional-dsvm/run.yaml
-    post-run: playbooks/legacy/neutron-classifier-functional-dsvm/post.yaml
+    name: neutron-classifier-functional
+    parent: neutron-functional
     timeout: 7800
     required-projects:
-      - openstack/devstack-gate
       - openstack/keystone
       - openstack/neutron
-    roles:
-      - zuul: openstack/devstack-gate
+      - openstack/glance
+      - openstack/nova
+      - openstack/placement
+      - openstack/python-openstackclient
     vars:
+      tox_install_siblings: true
       devstack_localrc:
-        DATABASE_PASSWORD: secretdatabase
-        RABBIT_PASSWORD: secretrabbit
-        ADMIN_PASSWORD: secretadmin
-        SERVICE_PASSWORD: secretservice
-        NETWORK_GATEWAY: 10.1.0.1
-        FIXED_RANGE: 10.1.0.0/20
-        IPV4_ADDRS_SAFE_TO_USE: 10.1.0.0/20
-        FLOATING_RANGE: 172.24.5.0/24
-        PUBLIC_NETWORK_GATEWAY: 172.24.5.1
-        LOGFILE: /opt/stack/logs/devstacklog.txt
-        LIBVIRT_TYPE: qemu
         LIBS_FROM_GIT: python-openstackclient
         GLANCE_V1_ENABLED: true
       devstack_services: