diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index baa031e6c4..6a31945835 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -603,6 +603,8 @@
     jobs:
       - ansible-role-jobs
       - hook-{name}-rtfd
+      - gate-{name}-pep8-{node}:
+          node: ubuntu-xenial
       - gate-{name}-python27-{node}:
           node: ubuntu-xenial
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 52ce0b63db..ad10c59e7e 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2780,9 +2780,6 @@ jobs:
       - 'jenkins/data/bindep-fallback.txt'
       - 'other-requirements.txt'
 
-  - name: gate-browbeat-linters-ubuntu-xenial
-    voting: false
-
   - name: ^gate-.*-tox-doc-publish-checkbuild.*$
     success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/publish-docs/
 
@@ -6180,8 +6177,10 @@ projects:
       - name: docs-on-rtfd
     check:
       - gate-browbeat-python27-ubuntu-xenial
+      - gate-browbeat-pep8-ubuntu-xenial
     gate:
       - gate-browbeat-python27-ubuntu-xenial
+      - gate-browbeat-pep8-ubuntu-xenial
 
   - name: openstack/castellan
     template: