diff --git a/providers/base/units/image/jobs.pxu b/providers/base/units/image/jobs.pxu
index d2e35eb59d..706ee82926 100644
--- a/providers/base/units/image/jobs.pxu
+++ b/providers/base/units/image/jobs.pxu
@@ -1,5 +1,7 @@
 id: image/kernel-publisher-canonical
 category_id: image
+imports: from com.canonical.plainbox import manifest
+requires: manifest.is_odm_cert_testing == 'True'
 _summary: Check that the kernel snap publisher is Canonical
 _purpose:
   During certification testing IoT devices must be running a kernel supplied
@@ -12,6 +14,8 @@ flags: preserve-locale
 
 id: image/kernel-tracking-stable
 category_id: image
+imports: from com.canonical.plainbox import manifest
+requires: manifest.is_odm_cert_testing == 'True'
 _summary: Check that the kernel snap is tracking stable channel
 _purpose:
   During certification testing, IoT devices must be running a kernel that is on
@@ -24,6 +28,8 @@ flags: preserve-locale
 
 id: image/gadget-publisher-canonical
 category_id: image
+imports: from com.canonical.plainbox import manifest
+requires: manifest.is_odm_cert_testing == 'True'
 _summary: Check that the gadget snap publisher is Canonical
 _description:
   During certification testing IoT devices must be running a kernel supplied
@@ -37,6 +43,8 @@ flags: preserve-locale
 
 id: image/gadget-tracking-stable
 category_id: image
+imports: from com.canonical.plainbox import manifest
+requires: manifest.is_odm_cert_testing == 'True'
 _summary: Check that the gadget snap is tracking stable channel
 _purpose:
   During certification testing IoT devices must be running a gadget that is on
@@ -49,6 +57,8 @@ flags: preserve-locale
 
 id: image/model-authority-canonical
 category_id: image
+imports: from com.canonical.plainbox import manifest
+requires: manifest.is_odm_cert_testing == 'True'
 _summary: Check that model authority-id is canonical
 _description:
   The authority-id declares on whose authority this assertion is made. This
@@ -62,6 +72,8 @@ flags: preserve-locale
 
 id: image/model-brand-canonical
 category_id: image
+imports: from com.canonical.plainbox import manifest
+requires: manifest.is_odm_cert_testing == 'True'
 _summary: Check the model brand-id is canonical
 _description:
   For the certification of IoT devices, Canonical-provided generic images must
diff --git a/providers/base/units/image/manifest.pxu b/providers/base/units/image/manifest.pxu
index fa6ef4da64..66d62a2f63 100644
--- a/providers/base/units/image/manifest.pxu
+++ b/providers/base/units/image/manifest.pxu
@@ -4,3 +4,8 @@ _name: Image is using 'dangerous' grade (should be set to 'No' unless you're doi
 _prompt: Does this setup have the following configuration?
 value-type: bool
 hidden-reason: Only images being used in lab testing can use 'dangerous' model grade
+
+unit: manifest entry
+id: is_odm_cert_testing
+_name: Is running ODM certification test
+value-type: bool
\ No newline at end of file
diff --git a/providers/certification-client/units/client-cert-iot-ubuntucore-24.pxu b/providers/certification-client/units/client-cert-iot-ubuntucore-24.pxu
index 71d8e7c4bd..cf32c26b8a 100644
--- a/providers/certification-client/units/client-cert-iot-ubuntucore-24.pxu
+++ b/providers/certification-client/units/client-cert-iot-ubuntucore-24.pxu
@@ -161,6 +161,7 @@ nested_part:
   wireless-automated
   wireless-wifi-master-mode-auto
   wwan-automated
+  iot-cert-image-automated
   after-suspend-audio-automated
   after-suspend-bluez-automated
   after-suspend-eeprom-automated