diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 22eaa8b8..69ee84c6 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -311,6 +311,9 @@ if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then
                 export GRENADE_NEW_BRANCH="stable/pike"
             elif [[ "$GRENADE_BASE_BRANCH" == "stable/pike" ]]; then
                 export GRENADE_OLD_BRANCH="stable/pike"
+                export GRENADE_NEW_BRANCH="stable/queens"
+            elif [[ "$GRENADE_BASE_BRANCH" == "stable/queens" ]]; then
+                export GRENADE_OLD_BRANCH="stable/queens"
                 export GRENADE_NEW_BRANCH="$GIT_BRANCH"
             fi
             ;;
@@ -333,8 +336,11 @@ if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then
             elif [[ "$GRENADE_BASE_BRANCH" == "stable/pike" ]]; then
                 export GRENADE_OLD_BRANCH="stable/ocata"
                 export GRENADE_NEW_BRANCH="stable/pike"
-            else # master
+            elif [[ "$GRENADE_BASE_BRANCH" == "stable/queens" ]]; then
                 export GRENADE_OLD_BRANCH="stable/pike"
+                export GRENADE_NEW_BRANCH="stable/queens"
+            else # master
+                export GRENADE_OLD_BRANCH="stable/queens"
                 export GRENADE_NEW_BRANCH="$GIT_BRANCH"
             fi
             ;;