diff --git a/.zuul.yaml b/.zuul.yaml
index 0e4d60c9227..7b227b20b91 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -12,16 +12,12 @@
     check:
       jobs:
         - neutron-functional
-        - neutron-fullstack
         - neutron-rally-neutron
         - 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-ovsfw
-        - neutron-grenade
         - openstack-tox-cover
         - tempest-full:
             irrelevant-files:
@@ -39,16 +35,16 @@
         - neutron-functional
         - neutron-tempest-dvr
         - neutron-tempest-linuxbridge
-        - neutron-grenade-multinode
-        - neutron-grenade-dvr-multinode
-        - neutron-grenade
-
         - openstack-tox-cover
     post:
       jobs:
         - openstack-tox-cover
     experimental:
       jobs:
+        - neutron-fullstack
+        - neutron-grenade
+        - neutron-grenade-multinode
+        - neutron-grenade-dvr-multinode
         - legacy-grenade-dsvm-neutron-linuxbridge-multinode:
             irrelevant-files:
               - ^(test-|)requirements.txt$
@@ -137,6 +133,8 @@
     required-projects:
       - openstack/devstack-gate
       - openstack/neutron
+    vars:
+      ensure_pip_from_packages_with_python2: yes
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$
@@ -152,6 +150,8 @@
     required-projects:
       - openstack/devstack-gate
       - openstack/neutron
+    vars:
+      ensure_pip_from_packages_with_python2: yes
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$
@@ -188,6 +188,8 @@
       - openstack/tripleo-image-elements
       - openstack/watcher
       - openstack/zaqar-ui
+    vars:
+      ensure_pip_from_packages_with_python2: yes
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$
@@ -340,6 +342,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 d256cef88d2..5ede5fa1c04 100644
--- a/neutron/tests/contrib/gate_hook.sh
+++ b/neutron/tests/contrib/gate_hook.sh
@@ -70,19 +70,7 @@ 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
-    elif [[ "$VENV" =~ "dsvm-functional" ]]; then
+    if [[ "$VENV" =~ "dsvm-functional" ]]; then
         # NOTE(slaweq): there is some bug in keepalived
         # 1:1.2.24-1ubuntu0.16.04.1, and because of that we have to use older
         # version for tests as workaround. For details check
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-rally-neutron/run.yaml b/playbooks/legacy/neutron-rally-neutron/run.yaml
index 1b115dd6150..8529b49fc2a 100644
--- a/playbooks/legacy/neutron-rally-neutron/run.yaml
+++ b/playbooks/legacy/neutron-rally-neutron/run.yaml
@@ -1,7 +1,11 @@
 - hosts: all
   name: Autoconverted job legacy-rally-dsvm-neutron-neutron from old job gate-rally-dsvm-neutron-neutron-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-tempest-ovsfw/run.yaml b/playbooks/legacy/neutron-tempest-ovsfw/run.yaml
index 7d4eec80223..c1766dfb442 100644
--- a/playbooks/legacy/neutron-tempest-ovsfw/run.yaml
+++ b/playbooks/legacy/neutron-tempest-ovsfw/run.yaml
@@ -1,7 +1,11 @@
 - hosts: all
   name: Autoconverted job legacy-tempest-dsvm-neutron-ovsfw from old job gate-tempest-dsvm-neutron-ovsfw-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'