diff --git a/.zuul.yaml b/.zuul.yaml
index 0cdd6573..d73899ff 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -4,17 +4,17 @@
     check:
       jobs:
         - grenade
-        - grenade-heat:
-            voting: false
         - grenade-multinode
+        - grenade-heat-multinode
+        - octavia-grenade
         - ironic-grenade:
             voting: false
-        - octavia-grenade:
-            voting: false
     gate:
       jobs:
         - grenade
         - grenade-multinode
+        - grenade-heat-multinode
+        - octavia-grenade
     experimental:
       jobs:
         - grenade-postgresql