diff --git a/jenkins/jobs/macros.yaml b/jenkins/jobs/macros.yaml
index 9958641836..5ed48a3724 100644
--- a/jenkins/jobs/macros.yaml
+++ b/jenkins/jobs/macros.yaml
@@ -1029,6 +1029,16 @@
           bundle exec rake
 
 
+  # This builder runs tools/test-setup.sh if its exists. This allows
+  # projects to setup unit tests in a specific way.
+- builder:
+    name: extra-test-setup
+    builders:
+      - shell: |
+          if [ -x tools/test-setup.sh ] ; then
+            tools/test-setup.sh
+          fi
+
 - builder:
     name: allow-local-ssh-root
     builders:
diff --git a/jenkins/jobs/python-jobs.yaml b/jenkins/jobs/python-jobs.yaml
index 2c4c33b326..3215be3441 100644
--- a/jenkins/jobs/python-jobs.yaml
+++ b/jenkins/jobs/python-jobs.yaml
@@ -11,6 +11,7 @@
           template-name: "{template-name}"
       - zuul-git-prep-upper-constraints
       - install-distro-packages
+      - extra-test-setup
       - revoke-sudo
       - coverage:
           env: cover
@@ -154,6 +155,7 @@
           template-name: "{template-name}"
       - zuul-git-prep-upper-constraints
       - install-distro-packages
+      - extra-test-setup
       - revoke-sudo
       - python27
       - assert-no-extra-files
@@ -294,6 +296,7 @@
           template-name: "{template-name}"
       - zuul-git-prep-upper-constraints
       - install-distro-packages
+      - extra-test-setup
       - revoke-sudo
       - python34
       - assert-no-extra-files
@@ -347,6 +350,7 @@
           template-name: "{template-name}"
       - zuul-git-prep-upper-constraints
       - install-distro-packages
+      - extra-test-setup
       - revoke-sudo
       - python35
       - assert-no-extra-files
@@ -474,6 +478,7 @@
           template-name: "{template-name}"
       - zuul-git-prep-upper-constraints
       - install-distro-packages
+      - extra-test-setup
       - revoke-sudo
       - run-tox:
           envlist: '{envlist}'