diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 3ad74e42..72fc6944 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -320,7 +320,13 @@ EOF
         fi
         # keystone deployed with mod wsgi cannot be upgraded or migrated
         # until https://launchpad.net/bugs/1365105 is resolved.
-        echo "KEYSTONE_USE_MOD_WSGI=False" >> "$localrc_file"
+        case $GRENADE_BASE_BRANCH in
+            "stable/icehouse")
+                ;&
+            "stable/juno")
+                echo "KEYSTONE_USE_MOD_WSGI=False" >> "$localrc_file"
+                ;;
+        esac
     fi
 
     if [[ "$DEVSTACK_GATE_TEMPEST_LARGE_OPS" -eq "1" ]]; then