diff --git a/playbooks/legacy/ironic-lib-tempest-partition-agent_ipmitool/run.yaml b/playbooks/legacy/ironic-lib-tempest-partition-agent_ipmitool/run.yaml
index 9f63ccb1..92bedc43 100644
--- a/playbooks/legacy/ironic-lib-tempest-partition-agent_ipmitool/run.yaml
+++ b/playbooks/legacy/ironic-lib-tempest-partition-agent_ipmitool/run.yaml
@@ -69,15 +69,8 @@
         cmd: |
           cat << 'EOF' >> ironic-vars-early
             # use tempest plugin
-          if [[ "$ZUUL_BRANCH" != "master" ]] ; then
-            # NOTE(jroll) if this is not a patch against master, then
-            # fetch master to install the plugin
-            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' git+git://git.openstack.org/openstack/ironic'"
-          else
-            # on master, use the local change, so we can pick up any changes to the plugin
-            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic'"
-          fi
-          export TEMPEST_CONCURRENCY=1
+            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
+            export TEMPEST_CONCURRENCY=1
           EOF
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -89,6 +82,7 @@
           export PROJECTS="openstack/ironic $PROJECTS"
           export PROJECTS="openstack/ironic-lib $PROJECTS"
           export PROJECTS="openstack/ironic-python-agent $PROJECTS"
+          export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
           export PROJECTS="openstack/python-ironicclient $PROJECTS"
           export PROJECTS="openstack/pyghmi $PROJECTS"
           export PROJECTS="openstack/virtualbmc $PROJECTS"
@@ -148,4 +142,4 @@
           ./safe-devstack-vm-gate-wrap.sh
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
\ No newline at end of file
+      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/ironic-lib-tempest-partition-pxe_ipmitool/run.yaml b/playbooks/legacy/ironic-lib-tempest-partition-pxe_ipmitool/run.yaml
index 63f991f8..f0c65b11 100644
--- a/playbooks/legacy/ironic-lib-tempest-partition-pxe_ipmitool/run.yaml
+++ b/playbooks/legacy/ironic-lib-tempest-partition-pxe_ipmitool/run.yaml
@@ -69,15 +69,8 @@
         cmd: |
           cat << 'EOF' >> ironic-vars-early
             # use tempest plugin
-          if [[ "$ZUUL_BRANCH" != "master" ]] ; then
-            # NOTE(jroll) if this is not a patch against master, then
-            # fetch master to install the plugin
-            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' git+git://git.openstack.org/openstack/ironic'"
-          else
-            # on master, use the local change, so we can pick up any changes to the plugin
-            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic'"
-          fi
-          export TEMPEST_CONCURRENCY=1
+            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
+            export TEMPEST_CONCURRENCY=1
           EOF
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -89,6 +82,7 @@
           export PROJECTS="openstack/ironic $PROJECTS"
           export PROJECTS="openstack/ironic-lib $PROJECTS"
           export PROJECTS="openstack/ironic-python-agent $PROJECTS"
+          export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
           export PROJECTS="openstack/python-ironicclient $PROJECTS"
           export PROJECTS="openstack/pyghmi $PROJECTS"
           export PROJECTS="openstack/virtualbmc $PROJECTS"
@@ -148,4 +142,4 @@
           ./safe-devstack-vm-gate-wrap.sh
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
\ No newline at end of file
+      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/ironic-lib-tempest-wholedisk-agent_ipmitool/run.yaml b/playbooks/legacy/ironic-lib-tempest-wholedisk-agent_ipmitool/run.yaml
index 818ad8a8..48b244ac 100644
--- a/playbooks/legacy/ironic-lib-tempest-wholedisk-agent_ipmitool/run.yaml
+++ b/playbooks/legacy/ironic-lib-tempest-wholedisk-agent_ipmitool/run.yaml
@@ -69,15 +69,8 @@
         cmd: |
           cat << 'EOF' >> ironic-vars-early
             # use tempest plugin
-          if [[ "$ZUUL_BRANCH" != "master" ]] ; then
-            # NOTE(jroll) if this is not a patch against master, then
-            # fetch master to install the plugin
-            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' git+git://git.openstack.org/openstack/ironic'"
-          else
-            # on master, use the local change, so we can pick up any changes to the plugin
-            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic'"
-          fi
-          export TEMPEST_CONCURRENCY=1
+            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
+            export TEMPEST_CONCURRENCY=1
           EOF
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -89,6 +82,7 @@
           export PROJECTS="openstack/ironic $PROJECTS"
           export PROJECTS="openstack/ironic-lib $PROJECTS"
           export PROJECTS="openstack/ironic-python-agent $PROJECTS"
+          export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
           export PROJECTS="openstack/python-ironicclient $PROJECTS"
           export PROJECTS="openstack/pyghmi $PROJECTS"
           export PROJECTS="openstack/virtualbmc $PROJECTS"
@@ -148,4 +142,4 @@
           ./safe-devstack-vm-gate-wrap.sh
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
\ No newline at end of file
+      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/ironic-lib-tempest-wholedisk-pxe_ipmitool/run.yaml b/playbooks/legacy/ironic-lib-tempest-wholedisk-pxe_ipmitool/run.yaml
index 9f86be72..d0ba2e4e 100644
--- a/playbooks/legacy/ironic-lib-tempest-wholedisk-pxe_ipmitool/run.yaml
+++ b/playbooks/legacy/ironic-lib-tempest-wholedisk-pxe_ipmitool/run.yaml
@@ -69,15 +69,8 @@
         cmd: |
           cat << 'EOF' >> ironic-vars-early
             # use tempest plugin
-          if [[ "$ZUUL_BRANCH" != "master" ]] ; then
-            # NOTE(jroll) if this is not a patch against master, then
-            # fetch master to install the plugin
-            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' git+git://git.openstack.org/openstack/ironic'"
-          else
-            # on master, use the local change, so we can pick up any changes to the plugin
-            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic'"
-          fi
-          export TEMPEST_CONCURRENCY=1
+            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
+            export TEMPEST_CONCURRENCY=1
           EOF
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -89,6 +82,7 @@
           export PROJECTS="openstack/ironic $PROJECTS"
           export PROJECTS="openstack/ironic-lib $PROJECTS"
           export PROJECTS="openstack/ironic-python-agent $PROJECTS"
+          export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
           export PROJECTS="openstack/python-ironicclient $PROJECTS"
           export PROJECTS="openstack/pyghmi $PROJECTS"
           export PROJECTS="openstack/virtualbmc $PROJECTS"
@@ -148,4 +142,4 @@
           ./safe-devstack-vm-gate-wrap.sh
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
\ No newline at end of file
+      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/zuul.d/legacy-ironic-lib-jobs.yaml b/zuul.d/legacy-ironic-lib-jobs.yaml
index 9d38b2e5..58b0a4e7 100644
--- a/zuul.d/legacy-ironic-lib-jobs.yaml
+++ b/zuul.d/legacy-ironic-lib-jobs.yaml
@@ -17,6 +17,7 @@
       - openstack/ironic
       - openstack/ironic-lib
       - openstack/ironic-python-agent
+      - openstack/ironic-tempest-plugin
       - openstack/pyghmi
       - openstack/python-ironicclient
       - openstack/virtualbmc