diff --git a/tox.ini b/tox.ini
index fbfae5cea..fce5ec72a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ setenv =
   LANGUAGE=en_US
   LC_ALL=en_US.utf-8
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
diff --git a/zuul.d/ironic-python-agent-jobs.yaml b/zuul.d/ironic-python-agent-jobs.yaml
index 5dc46d9c0..7b7e89383 100644
--- a/zuul.d/ironic-python-agent-jobs.yaml
+++ b/zuul.d/ironic-python-agent-jobs.yaml
@@ -182,8 +182,6 @@
     parent: ironic-ipa-base
     required-projects:
       - openstack/diskimage-builder
-      - name: openstack/ironic-python-agent-builder
-        override-checkout: 2.2.0
     timeout: 9600
     vars:
       tempest_test_timeout: 2400
@@ -230,6 +228,15 @@
 - job:
     name: ironic-python-agent-build-image-tinyipa-ussuri
     parent: ironic-python-agent-build-image-tinyipa
+    nodeset: ubuntu-bionic
     required-projects:
       - name: openstack/ironic-python-agent-builder
         override-checkout: 2.2.0
+
+- job:
+    name: ironic-python-agent-check-image-tinyipa-ussuri
+    parent: ironic-python-agent-check-image-tinyipa
+    nodeset: ubuntu-bionic
+    required-projects:
+        - name: openstack/ironic-python-agent-builder
+          override-checkout: 2.2.0
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 33c2062a6..693d5a649 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -15,7 +15,7 @@
         - metalsmith-integration-ipa-src
         # NOTE(dtantsur): non-voting because IPA source code is very unlikely
         # to break them. They rather serve as a canary for broken POST jobs.
-        - ironic-python-agent-check-image-tinyipa:
+        - ironic-python-agent-check-image-tinyipa-ussuri:
             voting: false
         - ironic-python-agent-check-image-dib-centos8:
             voting: false