diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 6b0b1e3b32..a842df7731 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -2527,6 +2527,7 @@ projects:
       - check-tempest-dsvm-ironic-nv
       - check-tempest-dsvm-ironic-postgres-nv
       - check-tempest-dsvm-virtual-ironic-nv
+      - check-tempest-dsvm-f20
     gate:
       - gate-devstack-bashate
       - gate-devstack-dsvm-cells
@@ -2542,7 +2543,6 @@ projects:
       - gate-grenade-dsvm-forward
       - check-tempest-master-dsvm-full-havana
       - check-tempest-master-dsvm-neutron-havana
-      - check-tempest-dsvm-f20
 
   - name: openstack-dev/grenade
     check:
@@ -2725,6 +2725,7 @@ projects:
       - check-tempest-dsvm-ironic-nv
       - check-tempest-dsvm-ironic-postgres-nv
       - check-tempest-dsvm-virtual-ironic-nv
+      - check-tempest-dsvm-f20
     gate:
       - gate-devstack-gate-unittests
       - gate-devstack-dsvm-cells
@@ -2736,7 +2737,6 @@ projects:
       - gate-grenade-dsvm-forward
       - check-tempest-master-dsvm-full-havana
       - check-tempest-master-dsvm-neutron-havana
-      - check-tempest-dsvm-f20
       - check-tempest-dsvm-aiopcpu
       - check-tempest-dsvm-neutron-aiopcpu
     experimental-tripleo: