diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml
index d1ecaeec2e..331280081e 100644
--- a/.gitlab/ci/dependencies/dependencies.yml
+++ b/.gitlab/ci/dependencies/dependencies.yml
@@ -117,7 +117,6 @@
     - - wifi      # pytest*wifi*
       - ethernet  # pytest*ethernet*
       - sdio      # pytest*sdio*
-      - usb       # USB Device & Host tests
   patterns:
     - "{0}-{1}-{2}"
     - "{0}-{2}"
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index 9d14675c64..7bc226eb5d 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -248,21 +248,6 @@
   - "components/esp_driver_sdmmc/include/driver/sdmmc*.h"
   - "components/sdmmc/**/*"
 
-# for jobs: USB host and device examples
-.patterns-example_test-usb: &patterns-example_test-usb
-  - "components/hal/usb*.c"
-  - "components/hal/esp32s*/include/hal/usb*.h"
-  - "components/usb/*include/**/*"
-  - "components/usb/*"
-  - "examples/peripherals/usb/host/**/**/**/*"
-  - "examples/peripherals/usb/device/**/**/*"
-
-# for jobs: USB component (Host) pytest test_app
-.patterns-component_ut-usb: &patterns-component_ut-usb
-  - "components/hal/usb*.c"
-  - "components/hal/esp32s*/include/hal/usb*.h"
-  - "components/usb/**/*"
-
 ##############
 # if anchors #
 ##############
@@ -1558,8 +1543,6 @@
       changes: *patterns-component_ut
     - <<: *if-dev-push
       changes: *patterns-component_ut-sdio
-    - <<: *if-dev-push
-      changes: *patterns-component_ut-usb
     - <<: *if-dev-push
       changes: *patterns-component_ut-wifi
     - <<: *if-dev-push
@@ -1574,8 +1557,6 @@
       changes: *patterns-example_test-ethernet
     - <<: *if-dev-push
       changes: *patterns-example_test-sdio
-    - <<: *if-dev-push
-      changes: *patterns-example_test-usb
     - <<: *if-dev-push
       changes: *patterns-example_test-wifi
     - <<: *if-dev-push
@@ -1767,19 +1748,6 @@
     - <<: *if-dev-push
       changes: *patterns-component_ut
 
-.rules:test:component_ut-esp32s3-usb:
-  rules:
-    - <<: *if-revert-branch
-      when: never
-    - <<: *if-protected
-    - <<: *if-label-build-only
-      when: never
-    - <<: *if-label-component_ut
-    - <<: *if-label-component_ut_esp32s3
-    - <<: *if-label-target_test
-    - <<: *if-dev-push
-      changes: *patterns-component_ut-usb
-
 .rules:test:component_ut-esp32s3-wifi:
   rules:
     - <<: *if-revert-branch
@@ -2194,19 +2162,6 @@
     - <<: *if-dev-push
       changes: *patterns-example_test-sdio
 
-.rules:test:example_test-esp32s2-usb:
-  rules:
-    - <<: *if-revert-branch
-      when: never
-    - <<: *if-protected
-    - <<: *if-label-build-only
-      when: never
-    - <<: *if-label-example_test
-    - <<: *if-label-example_test_esp32s2
-    - <<: *if-label-target_test
-    - <<: *if-dev-push
-      changes: *patterns-example_test-usb
-
 .rules:test:example_test-esp32s2-wifi:
   rules:
     - <<: *if-revert-branch
diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index 7f2062e482..95ec6630e1 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -544,15 +544,6 @@ pytest_examples_esp32c3_flash_encryption:
       artifacts: false
   tags: [ esp32c3, flash_encryption ]
 
-pytest_examples_esp32s2_usb_device:
-  extends:
-    - .pytest_examples_dir_template
-    - .rules:test:example_test-esp32s2-usb
-  needs:
-    - job: build_pytest_examples_esp32s2
-      artifacts: false
-  tags: [ esp32s2, usb_device ]
-
 pytest_examples_esp32_sdmmc:
   extends:
     - .pytest_examples_dir_template
@@ -1156,15 +1147,6 @@ pytest_examples_esp32h2_zigbee:
       artifacts: false
   tags: [ esp32h2, zigbee_multi_dut ]
 
-pytest_components_esp32s3_usb_host:
-  extends:
-    - .pytest_components_dir_template
-    - .rules:test:component_ut-esp32s3-usb
-  needs:
-    - job: build_pytest_components_esp32s3
-      artifacts: false
-  tags: [ esp32s3, usb_host_flash_disk ]
-
 .pytest_test_apps_dir_template:
   extends: .pytest_template
   variables:
diff --git a/components/usb/test_apps/.build-test-rules.yml b/components/usb/test_apps/.build-test-rules.yml
index d11df13540..77a723b155 100644
--- a/components/usb/test_apps/.build-test-rules.yml
+++ b/components/usb/test_apps/.build-test-rules.yml
@@ -3,3 +3,8 @@
 components/usb/test_apps:
   enable:
     - if: SOC_USB_OTG_SUPPORTED == 1
+  depends_components:
+    - usb
+  depends_filepatterns:
+    - components/hal/usb*.c
+    - components/hal/esp32*/include/hal/usb*.h
diff --git a/examples/peripherals/.build-test-rules.yml b/examples/peripherals/.build-test-rules.yml
index 8680827930..057af470e4 100644
--- a/examples/peripherals/.build-test-rules.yml
+++ b/examples/peripherals/.build-test-rules.yml
@@ -465,6 +465,21 @@ examples/peripherals/usb:
   disable:
     - if: SOC_USB_OTG_SUPPORTED != 1
 
+examples/peripherals/usb/device:
+  enable:
+    - if: SOC_USB_OTG_SUPPORTED == 1
+  disable_test:
+    - if: IDF_TARGET == "esp32s3"
+      temporary: true
+      reason: lack of runners
+  depends_components:
+    - usb
+  depends_filepatterns:
+    - components/hal/usb*.c
+    - components/hal/esp32*/include/hal/usb*.h
+    - examples/peripherals/usb/host/**/*
+    - examples/peripherals/usb/device/**/*
+
 examples/peripherals/usb_serial_jtag/usb_serial_jtag_echo:
   disable:
     - if: SOC_USB_SERIAL_JTAG_SUPPORTED != 1
diff --git a/examples/peripherals/usb/device/.build-test-rules.yml b/examples/peripherals/usb/device/.build-test-rules.yml
deleted file mode 100644
index 2e88c76571..0000000000
--- a/examples/peripherals/usb/device/.build-test-rules.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps
-
-examples/peripherals/usb/device:
-  enable:
-    - if: SOC_USB_OTG_SUPPORTED == 1
-  disable_test:
-    - if: IDF_TARGET == "esp32s3"
-      temporary: true
-      reason: lack of runners