diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 7d65f9f4..1c885f7a 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -201,7 +201,7 @@ if [ "$DEVSTACK_GATE_GRENADE" -eq "1" ]; then
         export GRENADE_OLD_BRANCH="stable/havana"
         export GRENADE_NEW_BRANCH="stable/icehouse"
     else # master
-        export GRENADE_OLD_BRANCH="stable/havana"
+        export GRENADE_OLD_BRANCH="stable/icehouse"
         export GRENADE_NEW_BRANCH="master"
     fi
     if [ "$DEVSTACK_GATE_GRENADE_PARTIAL_NCPU" -eq "1" ]; then
@@ -214,6 +214,9 @@ elif [ "$DEVSTACK_GATE_GRENADE_FORWARD" -eq "1" ]; then
     export DEVSTACK_GATE_TEMPEST=1
     if [ "$ZUUL_BRANCH" == "stable/havana" ]; then
         export GRENADE_OLD_BRANCH="stable/havana"
+        export GRENADE_NEW_BRANCH="stable/icehouse"
+    elif [ "$ZUUL_BRANCH" == "stable/icehouse" ]; then
+        export GRENADE_OLD_BRANCH="stable/icehouse"
         export GRENADE_NEW_BRANCH="master"
     fi
 fi