diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 233a1ea8..2b9f2506 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -172,6 +172,9 @@ export DEVSTACK_GATE_MARCONI=${DEVSTACK_GATE_MARCONI:-0}
 # Set to 0 to disable config_drive and use the metadata server instead
 export DEVSTACK_GATE_CONFIGDRIVE=${DEVSTACK_GATE_CONFIGDRIVE:-1}
 
+# Set to 1 to enable running a keystone v3 based gate
+export DEVSTACK_GATE_KEYSTONE_V3=${DEVSTACK_GATE_KEYSTONE_V3:-0}
+
 # Set the number of threads to run tempest with
 DEFAULT_CONCURRENCY=$(nproc)
 if [ ${DEFAULT_CONCURRENCY} > 3 ] ; then
diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index da3e0291..9f302b80 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -229,6 +229,11 @@ EOF
     else
         echo "FORCE_CONFIG_DRIVE=False" >>localrc
     fi
+    if [ "$DEVSTACK_GATE_KEYSTONE_V3" -eq "1" ]; then
+        # Run gate using only keystone v3
+        # For now this is only injected in tempest configuration
+        echo "TEMPEST_AUTH_VERSION=v3" >>localrc
+    fi
 }
 
 if [ "$DEVSTACK_GATE_GRENADE" -eq "1" ]; then