diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 6ebb192c..874f18b9 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -134,9 +134,9 @@ export DEVSTACK_GATE_TEMPEST_LARGE_OPS=${DEVSTACK_GATE_TEMPEST_LARGE_OPS:-0}
 # Set to 1 to run tempest smoke tests serially
 export DEVSTACK_GATE_SMOKE_SERIAL=${DEVSTACK_GATE_SMOKE_SERIAL:-0}
 
-# Set to 1 to explicitly enable tempest tenant isolation. Otherwise tenant isolation setting
+# Set to 1 to explicitly disable tempest tenant isolation. Otherwise tenant isolation setting
 # for tempest will be the one chosen by devstack.
-export DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=${DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION:-0}
+export DEVSTACK_GATE_TEMPEST_DISABLE_TENANT_ISOLATION=${DEVSTACK_GATE_TEMPEST_DISABLE_TENANT_ISOLATION:-0}
 
 # Set to 1 to enable Cinder secure delete.
 # False by default to avoid dd problems on Precise.
diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index d2cb1615..9f4951fb 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -203,8 +203,8 @@ EOF
         echo "TEMPEST_HTTP_IMAGE=http://127.0.0.1/" >> localrc
     fi
 
-    if [ "$DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION" -eq "1" ]; then
-        echo "TEMPEST_ALLOW_TENANT_ISOLATION=True" >>localrc
+    if [ "$DEVSTACK_GATE_TEMPEST_DISABLE_TENANT_ISOLATION" -eq "1" ]; then
+        echo "TEMPEST_ALLOW_TENANT_ISOLATION=False" >>localrc
     fi
 
     if [ "$DEVSTACK_GATE_GRENADE" -eq "1" ]; then
@@ -326,6 +326,10 @@ if [ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]; then
         echo "Running tempest all test suite"
         sudo -H -u tempest tox -eall -- --concurrency=$TEMPEST_CONCURRENCY
         res=$?
+    elif [[ "$DEVSTACK_GATE_TEMPEST_DISABLE_TENANT_ISOLATION" -eq "1" ]]; then
+        echo "Running tempest full test suite serially"
+        sudo -H -u tempest tox -efull-serial
+        res=$?
     elif [[ "$DEVSTACK_GATE_TEMPEST_FULL" -eq "1" ]]; then
         echo "Running tempest full test suite"
         sudo -H -u tempest tox -efull -- --concurrency=$TEMPEST_CONCURRENCY