diff --git a/.zuul.yaml b/.zuul.yaml
index 0b3d24e9048..2a362adea11 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -12,16 +12,12 @@
     check:
       jobs:
         - neutron-functional
-        - neutron-fullstack
         - neutron-rally-task
         - neutron-tempest-dvr
         - neutron-tempest-linuxbridge
-        - neutron-grenade-multinode
-        - neutron-grenade-dvr-multinode
         - neutron-tempest-multinode-full
         - neutron-tempest-dvr-ha-multinode-full
         - neutron-tempest-iptables_hybrid
-        - neutron-grenade
         - openstack-tox-lower-constraints
         - neutron-fullstack-python35
         # We don't run the job on things like neutron docs-only changes
@@ -52,13 +48,9 @@
     gate:
       jobs:
         - neutron-functional
-        - neutron-fullstack
         - neutron-tempest-dvr
         - neutron-tempest-linuxbridge
         - neutron-tempest-iptables_hybrid
-        - neutron-grenade-multinode
-        - neutron-grenade-dvr-multinode
-        - neutron-grenade
         - openstack-tox-lower-constraints
         - openstack-tox-cover
     periodic:
@@ -70,9 +62,12 @@
       jobs:
         - neutron-functional-python35
         - neutron-functional-with-uwsgi
+        - neutron-fullstack
         - neutron-fullstack-with-uwsgi
         - neutron-tempest-with-uwsgi
-
+        - neutron-grenade
+        - neutron-grenade-multinode
+        - neutron-grenade-dvr-multinode
         - legacy-grenade-dsvm-neutron-linuxbridge-multinode:
             irrelevant-files:
               - ^(test-|)requirements.txt$
@@ -163,6 +158,8 @@
     required-projects:
       - openstack/devstack-gate
       - openstack/neutron
+    vars:
+      ensure_pip_from_packages_with_python2: yes
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$
@@ -194,6 +191,8 @@
     required-projects:
       - openstack/devstack-gate
       - openstack/neutron
+    vars:
+      ensure_pip_from_packages_with_python2: yes
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$
@@ -383,6 +382,8 @@
       - openstack/devstack-gate
       - openstack/neutron
       - openstack/tempest
+    vars:
+      ensure_pip_from_packages_with_python2: yes
     irrelevant-files:
       - ^(test-|)requirements.txt$
       - ^.*\.rst$
diff --git a/neutron/tests/contrib/gate_hook.sh b/neutron/tests/contrib/gate_hook.sh
index f10b9f13ab8..942c451a1ad 100644
--- a/neutron/tests/contrib/gate_hook.sh
+++ b/neutron/tests/contrib/gate_hook.sh
@@ -70,20 +70,6 @@ case $VENV in
 
     configure_host_for_func_testing
 
-    # Because of bug present in current Ubuntu Xenial kernel version
-    # we need a fix for VXLAN local tunneling.
-    if [[ "$VENV" =~ "dsvm-fullstack" ]]; then
-        # The OVS_BRANCH variable is used by git checkout. In the case below,
-        # we use openvswitch commit 175be4bf23a206b264719b5661707af186b31f32
-        # that contains a fix for usage of VXLAN tunnels on a single node
-        # (commit 741f47cf35df2bfc7811b2cff75c9bb8d05fd26f) and is compatible
-        # with kernel 4.4.0-145
-        # NOTE(slaweq): Replace with a release tag when one is available.
-        # See commit 138df3e563de9da0e5a4155b3534a69621495742 (on the ovs repo).
-        OVS_BRANCH="175be4bf23a206b264719b5661707af186b31f32"
-        compile_ovs_kernel_module
-    fi
-
     # prepare base environment for ./stack.sh
     load_rc_hook stack_base
 
diff --git a/playbooks/legacy/neutron-fullstack/run.yaml b/playbooks/legacy/neutron-fullstack/run.yaml
index c13d6d7aaca..a98777d83f0 100644
--- a/playbooks/legacy/neutron-fullstack/run.yaml
+++ b/playbooks/legacy/neutron-fullstack/run.yaml
@@ -1,7 +1,11 @@
 - hosts: all
   name: Autoconverted job legacy-neutron-dsvm-fullstack from old job gate-neutron-dsvm-fullstack-ubuntu-xenial
   tasks:
-
+    - name: Ensure tox is installed
+      include_role:
+        name: ensure-tox
+      vars:
+        ensure_global_symlinks: True
     - name: Ensure legacy workspace directory
       file:
         path: '{{ ansible_user_dir }}/workspace'
diff --git a/playbooks/legacy/neutron-functional/run.yaml b/playbooks/legacy/neutron-functional/run.yaml
index 2c9819e9c9e..fdd79533eee 100644
--- a/playbooks/legacy/neutron-functional/run.yaml
+++ b/playbooks/legacy/neutron-functional/run.yaml
@@ -1,7 +1,11 @@
 - hosts: all
   name: Autoconverted job legacy-neutron-dsvm-functional from old job gate-neutron-dsvm-functional-ubuntu-xenial-nv
   tasks:
-
+    - name: Ensure tox is installed
+      include_role:
+        name: ensure-tox
+      vars:
+        ensure_global_symlinks: True
     - name: Ensure legacy workspace directory
       file:
         path: '{{ ansible_user_dir }}/workspace'
diff --git a/playbooks/legacy/neutron-tempest-iptables_hybrid/run.yaml b/playbooks/legacy/neutron-tempest-iptables_hybrid/run.yaml
index b7e4ee33eda..69b5a9ba666 100644
--- a/playbooks/legacy/neutron-tempest-iptables_hybrid/run.yaml
+++ b/playbooks/legacy/neutron-tempest-iptables_hybrid/run.yaml
@@ -1,7 +1,11 @@
 - hosts: all
   name: Neutron Tempest iptables-hybrid job
   tasks:
-
+    - name: Ensure tox is installed
+      include_role:
+        name: ensure-tox
+      vars:
+        ensure_global_symlinks: True
     - name: Ensure legacy workspace directory
       file:
         path: '{{ ansible_user_dir }}/workspace'