diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 7cea64fa06..0ceda0884b 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -2237,7 +2237,6 @@
 
     jobs:
       - gate-{name}-pep8
-      - gate-{name}-bashate
       - generate-specs-site-jobs
 
 - project:
diff --git a/tox.ini b/tox.ini
index 2bed09d887..c47de0b8f3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,9 @@ skipsdist = True
 deps = -r{toxinidir}/test-requirements.txt
 
 [testenv:pep8]
-commands = flake8
+commands =
+  flake8
+  {toxinidir}/tools/run-bashate.sh
 
 [testenv:gerrit]
 commands =
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index a0e2f19421..8d69e33ff3 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3570,7 +3570,6 @@ projects:
       - project-config-gerrit
       - gate-project-config-layout
       - gate-project-config-pep8
-      - gate-project-config-bashate
       - gate-project-config-irc-access
       - gate-project-config-jenkins-project
       - gate-project-config-projects-yaml
@@ -3578,7 +3577,6 @@ projects:
     gate:
       - gate-project-config-layout
       - gate-project-config-pep8
-      - gate-project-config-bashate
       - gate-project-config-irc-access
       - gate-project-config-jenkins-project
       - gate-project-config-projects-yaml