diff --git a/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml b/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
index 8608abf10f..2621075235 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
@@ -6,6 +6,10 @@
     name: gate-django_openstack_auth-noop
     node: precise
 
+- job:
+    name: gate-grenade-noop
+    node: precise
+
 - job-template:
     name: 'gate-{name}-run-tests'
 
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 21ede59cbf..7f910d95c8 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -95,6 +95,10 @@ jobs:
   - name: gate-grenade-devstack-vm-stable
     branch: ^(stable/grizzly).*$
     voting: false
+    # Remove when gate-grenade-devstack-vm-stable is
+    # merged into gate-grenade-devstack-vm
+  - name: gate-grenade-noop
+    branch: ^(stable/(folsom|grizzly)).*$
   - name: gate-tempest-docs
     branch: ^(?!stable/(folsom|grizzly)).*$
   - name: tempest-docs
@@ -1072,11 +1076,11 @@ projects:
 
   - name: openstack-dev/grenade
     check:
-      - gate-noop
+      - gate-grenade-noop
       - gate-grenade-devstack-vm
       - gate-grenade-devstack-vm-stable
     gate:
-      - gate-noop
+      - gate-grenade-noop
       - gate-grenade-devstack-vm
       - gate-grenade-devstack-vm-stable