diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
index 2c8e403020..6f7108cc28 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -62,7 +62,8 @@
 - builder:
     name: bashate
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-bashate.sh"
+      - tox:
+          envlist: bashate
 
 - builder:
     name: pep8
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 0774fb28b3..2d477b4965 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -275,6 +275,7 @@
       - gate-{name}-puppet-syntax
       - gate-{name}-puppet-apply
       - gate-{name}-pep8
+      - gate-{name}-bashate
       - experimental-swift-logs-{name}-pep8
 
 - project:
diff --git a/modules/openstack_project/files/slave_scripts/run-bashate.sh b/modules/openstack_project/files/slave_scripts/run-bashate.sh
deleted file mode 100755
index 8b28e14630..0000000000
--- a/modules/openstack_project/files/slave_scripts/run-bashate.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash -xe
-
-# Copyright 2013 OpenStack Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-set -o pipefail
-./run_tests.sh
-set +o pipefail
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 177ed594e7..a65818133c 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -738,6 +738,8 @@ jobs:
     branch: ^(?!stable/(havana|icehouse)).*$
   - name: gate-nova-pip-missing-reqs
     voting: false
+  - name: gate-config-bashate
+    voting: false
 
   # TODO(rpodolyaka): make voting when the jobs pass on all SA versions
   - name: gate-oslo.db-tox-sqla_08
@@ -2906,6 +2908,7 @@ projects:
       - config-compare-xml
       - gate-config-layout
       - gate-config-pep8
+      - gate-config-bashate
       - gate-config-puppet-syntax
       - gate-config-puppet-apply-precise
       - gate-config-puppet-apply-centos6
diff --git a/test-requirements.txt b/test-requirements.txt
index 3e36c602a9..27499c0368 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,3 +2,4 @@ hacking>=0.5.6,<0.8
 sphinx>=1.1.2,<1.2
 docutils==0.9.1
 oslosphinx
+bashate>=0.2
diff --git a/tox.ini b/tox.ini
index 34f9788932..462958ddc2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -54,3 +54,5 @@ commands =
   {toxinidir}/tools/check_projects_yaml_alphabetized.sh
   {toxinidir}/tools/run-layout.sh openstack-infra config
 
+[testenv:bashate]
+commands = bashate -v