diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index e62b1256..b77f8945 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -416,7 +416,7 @@ fi
 if ! function_exists "gate_hook"; then
     # the command we use to run the gate
     function gate_hook {
-        $BASE/new/devstack-gate/devstack-vm-gate.sh
+        $WORKSPACE/devstack-gate/devstack-vm-gate.sh
     }
     export -f gate_hook
 fi
@@ -434,7 +434,7 @@ set -x
 # Install ansible
 sudo -H pip install virtualenv
 virtualenv /tmp/ansible
-/tmp/ansible/bin/pip install ansible==$ANSIBLE_VERSION
+sudo -H /tmp/ansible/bin/pip install ansible==$ANSIBLE_VERSION
 export ANSIBLE=/tmp/ansible/bin/ansible
 
 # Write inventory file with groupings
diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 068a2fe4..4161d919 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -71,15 +71,19 @@ function setup_nova_net_networking {
     # issue with nova net configuring br100 to take over eth0
     # by default.
     # TODO (clarkb): figure out how to make bridge setup sane with ansible.
-    ovs_vxlan_bridge "br_pub" $primary_node "True" 1 \
-                    $FLOATING_HOST_PREFIX $FLOATING_HOST_MASK \
-                    $sub_nodes
-    ovs_vxlan_bridge "br_flat" $primary_node "False" 128 \
-                    $sub_nodes
-    cat <<EOF >>"$localrc"
+    if [[ "$DEVSTACK_GATE_VIRT_DRIVER" != "xenapi" ]]; then
+        # The following work around shouldn't be applied on xenapi, as xenserver
+        # has vmnet connected on eth3.
+        ovs_vxlan_bridge "br_pub" $primary_node "True" 1 \
+                        $FLOATING_HOST_PREFIX $FLOATING_HOST_MASK \
+                        $sub_nodes
+        ovs_vxlan_bridge "br_flat" $primary_node "False" 128 \
+                        $sub_nodes
+        cat <<EOF >>"$localrc"
 FLAT_INTERFACE=br_flat
 PUBLIC_INTERFACE=br_pub
 EOF
+    fi
 }
 
 function setup_multinode_connectivity {
@@ -366,15 +370,15 @@ EOF
             exit 1
         fi
         cat >> "$localrc_file" << EOF
+# Need to force devstack to run because we currently use saucy
+FORCE=yes
+
 SKIP_EXERCISES=${SKIP_EXERCISES},volumes
 XENAPI_PASSWORD=${DEVSTACK_GATE_XENAPI_PASSWORD}
 XENAPI_CONNECTION_URL=http://${DEVSTACK_GATE_XENAPI_DOM0_IP}
 VNCSERVER_PROXYCLIENT_ADDRESS=${DEVSTACK_GATE_XENAPI_DOM0_IP}
 VIRT_DRIVER=xenserver
 
-# A separate xapi network is created with this name-label
-FLAT_NETWORK_BRIDGE=vmnet
-
 # A separate xapi network on eth4 serves the purpose of the public network.
 # This interface is added in Citrix's XenServer environment as an internal
 # interface
@@ -400,9 +404,17 @@ EXTRA_OPTS=("xenapi_disable_agent=True")
 # Add a separate device for volumes
 VOLUME_BACKING_DEVICE=/dev/xvdb
 
-# Set multi-host config
-MULTI_HOST=1
+# We use single host for XenAPI test
+MULTI_HOST=False
 EOF
+
+        # neutron network will set FLAT_NETWORK_BRIDGE in pre_test_hook
+        if [[ $DEVSTACK_GATE_NEUTRON -ne "1" ]]; then
+            cat >> "$localrc_file" << EOF
+# A separate xapi network is created with this name-label
+FLAT_NETWORK_BRIDGE=vmnet
+EOF
+        fi
     fi
 
     if [[ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]]; then
diff --git a/features.yaml b/features.yaml
index 50b35f19..f6c11cff 100644
--- a/features.yaml
+++ b/features.yaml
@@ -1,10 +1,10 @@
 config:
   default:
-    master: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone]
-    liberty: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone]
-    kilo: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone]
-    juno: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone]
-    icehouse: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone]
+    master: [default, glance, horizon, nova, swift, cinder, keystone]
+    liberty: [default, glance, horizon, nova, swift, cinder, keystone]
+    kilo: [default, glance, horizon, nova, swift, cinder, keystone]
+    juno: [default, glance, horizon, nova, swift, cinder, keystone]
+    icehouse: [default, glance, horizon, nova, swift, cinder, keystone]
     # This can be used by functional jobs that only want their dependencies installed
     # and don't need to incur the overhead of installing all services in the process.
     no_services: [default]
diff --git a/functions.sh b/functions.sh
index 6bb9af06..066eb5c6 100644
--- a/functions.sh
+++ b/functions.sh
@@ -455,18 +455,21 @@ function setup_project {
         FALLBACK_ZUUL_REF=$(echo $ZUUL_REF | sed -e "s,$branch,master,")
     fi
 
+    if git_has_branch $project $branch; then
+        git_checkout $project $branch
+    else
+        git_checkout $project master
+    fi
+
     # See if Zuul prepared a ref for this project
     if git_fetch_at_ref $project $OVERRIDE_ZUUL_REF || \
         git_fetch_at_ref $project $FALLBACK_ZUUL_REF; then
 
-        # It's there, so check it out.
-        git_checkout $project FETCH_HEAD
-    else
-        if git_has_branch $project $branch; then
-            git_checkout $project $branch
-        else
-            git_checkout $project master
-        fi
+        git config --global user.email "openstack@citrix.com"
+        git config --global user.name "Citrix CI"
+
+        # It's there, so merge it
+        git merge FETCH_HEAD
     fi
 }