diff --git a/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/units/wifi/manifest.pxu b/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/units/wifi/manifest.pxu
new file mode 100644
index 0000000000..18fddf7495
--- /dev/null
+++ b/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/units/wifi/manifest.pxu
@@ -0,0 +1,4 @@
+unit: manifest entry
+id: has_wifi_ap_host
+_name: Does WiFi AP paring HOST machine available for testing WiFi AP mode?
+value-type: bool
diff --git a/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/units/wifi/wifi-ap.pxu b/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/units/wifi/wifi-ap.pxu
index 83961119a3..440e04d463 100644
--- a/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/units/wifi/wifi-ap.pxu
+++ b/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/units/wifi/wifi-ap.pxu
@@ -42,8 +42,11 @@ plugin: shell
 environ: WIFI_AP_HOST_DEVICE_IP WIFI_AP_HOST_DEVICE_USER WIFI_AP_HOST_DEVICE_PWD WIFI_AP_HOST_DEVICE_INTERFACE
 imports:
   from com.canonical.certification import net_if_management
+  from com.canonical.plainbox import manifest
 requires:
- net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'NetworkManager'
+  net_if_management.device == '{interface}'
+  net_if_management.master_mode_managed_by == 'NetworkManager'
+  manifest.has_wifi_ap_host == 'True'
 estimated_duration: 120.0
 flags: preserve-locale also-after-suspend
 command:
@@ -64,8 +67,11 @@ plugin: shell
 environ: WIFI_AP_HOST_DEVICE_IP WIFI_AP_HOST_DEVICE_USER WIFI_AP_HOST_DEVICE_PWD WIFI_AP_HOST_DEVICE_INTERFACE
 imports:
   from com.canonical.certification import net_if_management
+  from com.canonical.plainbox import manifest
 requires:
- net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'NetworkManager'
+  net_if_management.device == '{interface}'
+  net_if_management.master_mode_managed_by == 'NetworkManager'
+  manifest.has_wifi_ap_host == 'True'
 estimated_duration: 120.0
 flags: preserve-locale also-after-suspend
 command: