diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 10462ee39a..2186f64caf 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -394,6 +394,9 @@ jobs:
     voting: false
   - name: check-tempest-dsvm-cells-full
     voting: false
+  # tempest and d-g branchless tests need to only run on master
+  - name: ^.*(-icehouse|-havana)$
+    branch: ^master.*$
 # For Gerrit ver 2.4.x (using maven)
   - name: ^(gate|check)-gerrit-unittests$
     branch: ^openstack/2\.4.*$