diff --git a/.build-test-rules.yml b/.build-test-rules.yml
index 1d32d8d02..3d27ff8a6 100644
--- a/.build-test-rules.yml
+++ b/.build-test-rules.yml
@@ -67,6 +67,16 @@ host/usb:
     - if: IDF_VERSION < "5.4.0"
       reason: We will support component overriding only in service releases
 
+host/usb/test/target_test/enum:
+  depends_filepatterns:
+    - 'host/usb/**'
+  enable:
+    - if: SOC_USB_OTG_SUPPORTED == 1 and ENV_VAR_USB_COMP_MANAGED == "yes" and IDF_TARGET not in ["esp32s31"]
+      reason: Test uses FSLS PHY interface to emulate device attach/detach which the esp32s31 lacks
+  disable:
+    - if: IDF_VERSION < "5.4.0"
+      reason: We will support component overriding only in service releases
+
 # Host tests
 .host_test_enable_rules: &host_test_enable_rules
   enable:
diff --git a/host/usb/test/target_test/common/hcd_common.c b/host/usb/test/target_test/common/hcd_common.c
index f07f0b63c..004ebb4a7 100644
--- a/host/usb/test/target_test/common/hcd_common.c
+++ b/host/usb/test/target_test/common/hcd_common.c
@@ -9,7 +9,6 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "freertos/task.h"
-#include "soc/usb_wrap_struct.h"
 #include "esp_intr_alloc.h"
 #include "esp_err.h"
 #include "esp_attr.h"