diff --git a/.zuul.yaml b/.zuul.yaml
index 70cfafbcee..b184e0cca0 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -245,6 +245,9 @@
         GLANCE_ENABLE_MULTIPLE_STORES: True
         CINDER_ENABLED_BACKENDS: lvm:lvmdriver-1,lvm:lvmdriver-2
         GLANCE_CINDER_DEFAULT_BACKEND: lvmdriver-1
+        # Glance RBAC new defaults are tested by default so we need to test
+        # old defaults in some job.
+        GLANCE_ENFORCE_SCOPE: false
 
 - job:
     name: glance-multistore-cinder-import-fips
@@ -299,9 +302,9 @@
       Glance services.
     vars:
       devstack_localrc:
-        NOVA_ENFORCE_SCOPE: true
+        # Nova and glance scope and new defaults are enabled by default in
+        # Devstack so we do not need to explicitly set that to True.
         CINDER_ENFORCE_SCOPE: true
-        GLANCE_ENFORCE_SCOPE: true
 
 - project:
     templates: