diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 5112606a..d284d0f0 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -182,23 +182,19 @@ export DEVSTACK_GATE_GRENADE_FORWARD=${DEVSTACK_GATE_GRENADE_FORWARD:-0}
 export DEVSTACK_GATE_GRENADE_ROLLING=${DEVSTACK_GATE_GRENADE_ROLLING:-0}
 
 if [ "$DEVSTACK_GATE_GRENADE" -eq "1" ]; then
-    export DEVSTACK_GATE_EXERCISES=1
+    export DEVSTACK_GATE_TEMPEST=1
     if [ "$ZUUL_BRANCH" == "stable/havana" ]; then
         export GRENADE_OLD_BRANCH="stable/grizzly"
         export GRENADE_NEW_BRANCH="stable/havana"
-        export DEVSTACK_GATE_TEMPEST=1
     elif [ "$ZUUL_BRANCH" == "stable/icehouse" ]; then
         export GRENADE_OLD_BRANCH="stable/havana"
         export GRENADE_NEW_BRANCH="stable/icehouse"
-        export DEVSTACK_GATE_TEMPEST=1
     else # master
         export GRENADE_OLD_BRANCH="stable/havana"
         export GRENADE_NEW_BRANCH="master"
-        export DEVSTACK_GATE_TEMPEST=1
     fi
     # the roll forward case
 elif [ "$DEVSTACK_GATE_GRENADE_FORWARD" -eq "1" ]; then
-    export DEVSTACK_GATE_EXERCISES=1
     export DEVSTACK_GATE_TEMPEST=1
     if [ "$ZUUL_BRANCH" == "stable/grizzly" ]; then
         export GRENADE_OLD_BRANCH="stable/grizzly"
diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index b84a022f..df0d060e 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -47,7 +47,7 @@ function setup_localrc() {
         MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,tempest
     fi
 
-    # the exercises we *don't* want to test on for grenade
+    # the exercises we *don't* want to test on for devstack
     SKIP_EXERCISES=boot_from_volume,bundle,client-env,euca
 
     if [ "$LOCALRC_BRANCH" == "stable/grizzly" ]; then
@@ -249,7 +249,6 @@ BASE_DEVSTACK_DIR=\$BASE_RELEASE_DIR/devstack
 TARGET_RELEASE=new
 TARGET_RELEASE_DIR=$BASE/\$TARGET_RELEASE
 TARGET_DEVSTACK_DIR=\$TARGET_RELEASE_DIR/devstack
-TARGET_RUN_EXERCISES=False
 TARGET_RUN_SMOKE=False
 SAVE_DIR=\$BASE_RELEASE_DIR/save
 EOF