diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 68411bc5..edc2d250 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -8,7 +8,9 @@
       - release-notes-jobs-python3
     check:
       jobs:
-        - sushy-tempest-ironic-partition-redfish-src
+        - sushy-tempest-partition-bios-redfish-pxe
+        - sushy-tempest-partition-uefi-redfish-vmedia
     gate:
       jobs:
-        - sushy-tempest-ironic-partition-redfish-src
+        - sushy-tempest-partition-bios-redfish-pxe
+        - sushy-tempest-partition-uefi-redfish-vmedia
diff --git a/zuul.d/sushy-jobs.yaml b/zuul.d/sushy-jobs.yaml
index e6c4d6a2..79145832 100644
--- a/zuul.d/sushy-jobs.yaml
+++ b/zuul.d/sushy-jobs.yaml
@@ -1,16 +1,17 @@
 - job:
-    name: sushy-tempest-ironic-partition-redfish-src
-    parent: ironic-base
+    name: sushy-tempest-partition-bios-redfish-pxe
+    parent: ironic-tempest-partition-bios-redfish-pxe
+    irrelevant-files:
+      - ^test-requirements.txt$
+      - ^sushy/tests/.*$
+    required-projects:
+      - openstack/sushy
+
+- job:
+    name: sushy-tempest-partition-uefi-redfish-vmedia
+    parent: ironic-tempest-partition-uefi-redfish-vmedia
     irrelevant-files:
       - ^test-requirements.txt$
       - ^sushy/tests/.*$
-    timeout: 5400
     required-projects:
       - openstack/sushy
-    vars:
-      devstack_localrc:
-        IRONIC_DEFAULT_BOOT_OPTION: netboot
-        IRONIC_DEPLOY_DRIVER: redfish
-        IRONIC_ENABLED_HARDWARE_TYPES: redfish
-        IRONIC_DEFAULT_RESCUE_INTERFACE: ""
-        EBTABLES_RACE_FIX: True