diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 444d26db..f7c4fedd 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -83,8 +83,6 @@ function setup_workspace {
           GERRIT_BRANCH=master
       fi
 
-      export GERRIT_BRANCH
-      export GERRIT_PROJECT
       /usr/local/jenkins/slave_scripts/gerrit-git-prep.sh review.openstack.org
 
       cd $DEST
diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 81e5135a..323e522e 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -29,7 +29,8 @@ if [ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]; then
     ENABLED_SERVICES=$ENABLED_SERVICES,tempest
 fi
 
-if [ "$BRANCH" != "stable/diablo" ] && [ "$BRANCH" != "stable/essex" ]; then
+if [ "$GERRIT_BRANCH" != "stable/diablo" ] && 
+   [ "$GERRIT_BRANCH" != "stable/essex" ]; then
     ENABLED_SERVICES=$ENABLED_SERVICES,cinder,c-api,c-vol,c-sch
 else
     ENABLED_SERVICES=$ENABLED_SERVICES,n-vol