diff --git a/libraries/WiFi/examples/WiFiClientEnterprise/WiFiClientEnterprise.ino b/libraries/WiFi/examples/WiFiClientEnterprise/WiFiClientEnterprise.ino
index 75b7a4dcc06..198f97e2805 100644
--- a/libraries/WiFi/examples/WiFiClientEnterprise/WiFiClientEnterprise.ino
+++ b/libraries/WiFi/examples/WiFiClientEnterprise/WiFiClientEnterprise.ino
@@ -1,3 +1,8 @@
+#include "sdkconfig.h"
+#if CONFIG_ESP_WIFI_REMOTE_ENABLED
+#error "WPA-Enterprise is only supported in SoCs with native Wi-Fi support"
+#endif
+
 #include <WiFi.h>                      //Wifi library
 #define EAP_IDENTITY "login"           //if connecting from another corporation, use identity@organization.domain in Eduroam
 #define EAP_USERNAME "login"           //oftentimes just a repeat of the identity
diff --git a/libraries/WiFi/examples/WiFiClientEnterprise/ci.json b/libraries/WiFi/examples/WiFiClientEnterprise/ci.json
index 618e46bd244..36babb82730 100644
--- a/libraries/WiFi/examples/WiFiClientEnterprise/ci.json
+++ b/libraries/WiFi/examples/WiFiClientEnterprise/ci.json
@@ -1,6 +1,5 @@
 {
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
   ]
 }
diff --git a/libraries/WiFiProv/examples/WiFiProv/WiFiProv.ino b/libraries/WiFiProv/examples/WiFiProv/WiFiProv.ino
index 59b8bfc359e..76025d75770 100644
--- a/libraries/WiFiProv/examples/WiFiProv/WiFiProv.ino
+++ b/libraries/WiFiProv/examples/WiFiProv/WiFiProv.ino
@@ -8,6 +8,11 @@ Note: This sketch takes up a lot of space for the app and may not be able to fla
    - for example "No OTA (2MB APP/2MB SPIFFS)"
 */
 
+#include "sdkconfig.h"
+#if CONFIG_ESP_WIFI_REMOTE_ENABLED
+#error "WiFiProv is only supported in SoCs with native Wi-Fi support"
+#endif
+
 #include "WiFiProv.h"
 #include "WiFi.h"
 
diff --git a/libraries/WiFiProv/examples/WiFiProv/ci.json b/libraries/WiFiProv/examples/WiFiProv/ci.json
index cbdd28f773d..04eb62b977a 100644
--- a/libraries/WiFiProv/examples/WiFiProv/ci.json
+++ b/libraries/WiFiProv/examples/WiFiProv/ci.json
@@ -1,7 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=huge_app",
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y"
   ]
 }