diff --git a/device/esp_tinyusb/test_app/main/test_bvalid_sig.c b/device/esp_tinyusb/test_app/main/test_bvalid_sig.c
index cce9946f..ad74c52d 100644
--- a/device/esp_tinyusb/test_app/main/test_bvalid_sig.c
+++ b/device/esp_tinyusb/test_app/main/test_bvalid_sig.c
@@ -65,7 +65,7 @@ void tud_umount_cb(void)
     dev_umounted++;
 }
 
-TEST_CASE("bvalid_signal", "[esp_tinyusb]")
+TEST_CASE("bvalid_signal", "[esp_tinyusb][usb_device]")
 {
     unsigned int rounds = DEVICE_DETACH_TEST_ROUNDS;
 
diff --git a/host/class/cdc/usb_host_cdc_acm/test_app/pytest_usb_device.py b/device/esp_tinyusb/test_app/pytest_usb_device_cdc.py
similarity index 98%
rename from host/class/cdc/usb_host_cdc_acm/test_app/pytest_usb_device.py
rename to device/esp_tinyusb/test_app/pytest_usb_device_cdc.py
index 0ae37967..d6cbe4c1 100644
--- a/host/class/cdc/usb_host_cdc_acm/test_app/pytest_usb_device.py
+++ b/device/esp_tinyusb/test_app/pytest_usb_device_cdc.py
@@ -13,7 +13,7 @@
 @pytest.mark.esp32s2
 @pytest.mark.esp32s3
 @pytest.mark.usb_device
-def test_usb_device(dut) -> None:
+def test_usb_device_cdc(dut) -> None:
     '''
     Running the test locally:
     1. Build the testa app for your DUT (ESP32-S2 or S3)
diff --git a/device/esp_tinyusb/test_app/pytest_usb_device_esp_tinyusb.py b/device/esp_tinyusb/test_app/pytest_usb_device_esp_tinyusb.py
index b75af36f..700a3566 100644
--- a/device/esp_tinyusb/test_app/pytest_usb_device_esp_tinyusb.py
+++ b/device/esp_tinyusb/test_app/pytest_usb_device_esp_tinyusb.py
@@ -11,4 +11,4 @@
 @pytest.mark.esp32s3
 @pytest.mark.usb_device
 def test_usb_device_esp_tinyusb(dut: IdfDut) -> None:
-    dut.run_all_single_board_cases(group='esp_tinyusb')
+    dut.run_all_single_board_cases(group='usb_device')
diff --git a/host/class/cdc/usb_host_cdc_acm/test_app/README.md b/host/class/cdc/usb_host_cdc_acm/test_app/README.md
index 55db6c39..cc35c024 100644
--- a/host/class/cdc/usb_host_cdc_acm/test_app/README.md
+++ b/host/class/cdc/usb_host_cdc_acm/test_app/README.md
@@ -1,4 +1,15 @@
 | Supported Targets | ESP32-S2 | ESP32-S3 |
 | ----------------- | -------- | -------- |
 
-# USB: CDC Class test application
\ No newline at end of file
+# USB: CDC Class test application
+
+## CDC-ACM driver
+
+It tests basic functionality of the driver like open/close/read/write operations,
+advanced features like CDC control request, multi-threaded or multi-device access,
+as well as reaction to sudden disconnection and other error states.
+
+### Hardware Required
+
+This test expects that TinyUSB dual CDC device with VID = 0x303A and PID = 0x4002
+is connected to the USB host.
\ No newline at end of file
diff --git a/host/class/msc/usb_host_msc/test_app/README.md b/host/class/msc/usb_host_msc/test_app/README.md
index 55db6c39..7384992b 100644
--- a/host/class/msc/usb_host_msc/test_app/README.md
+++ b/host/class/msc/usb_host_msc/test_app/README.md
@@ -1,4 +1,14 @@
 | Supported Targets | ESP32-S2 | ESP32-S3 |
 | ----------------- | -------- | -------- |
 
-# USB: CDC Class test application
\ No newline at end of file
+# USB: CDC Class test application
+
+## MSC driver
+
+Basic functionality such as MSC device install/uninstall, file operations, 
+raw access to MSC device and sudden disconnect is tested.
+
+### Hardware Required
+
+This test requires two ESP32-S2/S3 boards with a interconnected USB peripherals,
+one acting as host running MSC host driver and another MSC device driver (tinyusb).
\ No newline at end of file