diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index f0f8173a5e..1ee5170b1d 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -2395,7 +2395,6 @@ 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-bash8
       - gate-devstack-dsvm-cells
@@ -2411,6 +2410,7 @@ 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:
@@ -2592,7 +2592,6 @@ 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
@@ -2604,6 +2603,7 @@ projects:
       - gate-grenade-dsvm-forward
       - check-tempest-master-dsvm-full-havana
       - check-tempest-master-dsvm-neutron-havana
+      - check-tempest-dsvm-f20
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
       - check-tripleo-undercloud-precise