diff --git a/playbooks/base-test/post.yaml b/playbooks/base-test/post.yaml
new file mode 100644
index 0000000000..d793838ce6
--- /dev/null
+++ b/playbooks/base-test/post.yaml
@@ -0,0 +1,3 @@
+- hosts: all
+  roles:
+    - remove-build-sshkey
diff --git a/playbooks/base-test/pre.yaml b/playbooks/base-test/pre.yaml
new file mode 100644
index 0000000000..4f4c395dc5
--- /dev/null
+++ b/playbooks/base-test/pre.yaml
@@ -0,0 +1,3 @@
+- hosts: all
+  roles:
+    - add-build-sshkey
diff --git a/zuul.yaml b/zuul.yaml
index 2a08098ac8..ec61720671 100644
--- a/zuul.yaml
+++ b/zuul.yaml
@@ -44,6 +44,15 @@
       - name: ubuntu-xenial
         label: ubuntu-xenial
 
+- job:
+    name: base-test
+    description: |
+      A job to test changes to the base job without disturbing the
+      main job in production.  Not for general use.
+    parent: base
+    pre-run: playbooks/base-test/pre
+    post-run: playbooks/base-test/post
+
 - project:
     name: openstack-infra/openstack-zuul-jobs
     check: