diff --git a/imagebuild/tinyipa/install-deps.sh b/imagebuild/tinyipa/install-deps.sh
index 1c055544d..8bd7a88d3 100755
--- a/imagebuild/tinyipa/install-deps.sh
+++ b/imagebuild/tinyipa/install-deps.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 
-COMMON_PACKAGES="wget python-pip unzip sudo gawk"
+if ! $(pip -V &>/dev/null); then
+    echo "Warning: Please install python-pip manually"
+    exit 1
+fi
+COMMON_PACKAGES="wget unzip sudo gawk"
 APT_PACKAGES="${COMMON_PACKAGES} squashfs-tools"
 YUM_PACKAGES="${COMMON_PACKAGES} squashfs-tools"
 ZYPPER_PACKAGES="${COMMON_PACKAGES} squashfs"
diff --git a/zuul.d/legacy-ironic-jobs.yaml b/zuul.d/legacy-ironic-jobs.yaml
index f52e4c6f8..5520efa90 100644
--- a/zuul.d/legacy-ironic-jobs.yaml
+++ b/zuul.d/legacy-ironic-jobs.yaml
@@ -17,7 +17,8 @@
       - openstack/ironic
       - openstack/ironic-lib
       - openstack/ironic-python-agent
-      - openstack/ironic-tempest-plugin
+      - name: openstack/ironic-tempest-plugin
+        override-checkout: 1.2.1
       - x/pyghmi
       - openstack/python-ironicclient
       - openstack/tempest
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index ecef1bbe6..fb1cec8af 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -7,13 +7,9 @@
       - release-notes-jobs
     check:
       jobs:
-        - ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src
         - ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src
-        - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src
         - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src
-        - ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src
         - ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src
-        - ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src
         - ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src
         # Non-voting jobs
         - ipa-tempest-dsvm-ironic-inspector-src:
@@ -23,13 +19,9 @@
     gate:
       queue: ironic
       jobs:
-        - ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src
         - ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src
-        - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src
         - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src
-        - ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src
         - ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src
-        - ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src
         - ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src
     experimental:
       jobs: