diff --git a/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/units/socketcan/manifest.pxu b/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/units/socketcan/manifest.pxu
index 8865bbe932..e69de29bb2 100644
--- a/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/units/socketcan/manifest.pxu
+++ b/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/units/socketcan/manifest.pxu
@@ -1,4 +0,0 @@
-unit: manifest entry
-id: has_socket_can_fd
-_name: CAN FD capable devices
-value-type: bool
diff --git a/providers/base/units/socketcan/jobs.pxu b/providers/base/units/socketcan/jobs.pxu
index 6cc263afec..c9f6b62011 100644
--- a/providers/base/units/socketcan/jobs.pxu
+++ b/providers/base/units/socketcan/jobs.pxu
@@ -68,6 +68,9 @@ plugin: shell
 user: root
 estimated_duration: 2.0
 flags: also-after-suspend
+imports: from com.canonical.plainbox import manifest
+requires:
+  manifest.has_socket_can_fd == 'True'
 command:
   BASH_XTRACEFD=1
   set -ex
@@ -141,7 +144,9 @@ user: root
 estimated_duration: 2.0
 flags: also-after-suspend
 imports: from com.canonical.plainbox import manifest
-requires: manifest.socket_can_echo_server_running == 'False'
+requires:
+  manifest.socket_can_echo_server_running == 'False'
+  manifest.has_socket_can_fd == 'True'
 command:
  BASH_XTRACEFD=1
  set -ex
@@ -224,7 +229,9 @@ user: root
 estimated_duration: 5.0
 flags: also-after-suspend
 imports: from com.canonical.plainbox import manifest
-requires: manifest.socket_can_echo_server_running == 'True'
+requires:
+  manifest.socket_can_echo_server_running == 'True'
+  manifest.has_socket_can_fd == 'True'
 command:
   BASH_XTRACEFD=1
   set -ex
diff --git a/providers/base/units/socketcan/manifest.pxu b/providers/base/units/socketcan/manifest.pxu
index d2efeb5a84..dbaeae7908 100644
--- a/providers/base/units/socketcan/manifest.pxu
+++ b/providers/base/units/socketcan/manifest.pxu
@@ -4,3 +4,8 @@ id: socket_can_echo_server_running
 _prompt: Is the device connected to the following?:
 _name: A SocketCAN Echo Server
 value-type: bool
+
+unit: manifest entry
+id: has_socket_can_fd
+_name: CAN FD capable devices
+value-type: bool