diff --git a/test/hil/hil_test.py b/test/hil/hil_test.py
index 8ae9ee0dc..ec6c7c448 100755
--- a/test/hil/hil_test.py
+++ b/test/hil/hil_test.py
@@ -1490,9 +1490,13 @@ def test_device_hid_generic_inout(board):
 # device tests
 # note don't test 2 examples with cdc or 2 msc next to each other
 device_tests = [
+    # Order matters: cdc_msc and cdc_msc_throughput share the same VID:PID (cafe:4003), so keep a
+    # differently-PID'd example (dfu, cafe:4000) between them. Boards whose CPU-reset does not drop
+    # D+ (e.g. WCH CH58x via openocd) only re-enumerate when the PID changes; back-to-back same-PID
+    # firmware would otherwise leave the host on the previous example's cached descriptors.
     'device/cdc_dual_ports',
-    'device/dfu',
     'device/cdc_msc',
+    'device/dfu',
     'device/cdc_msc_throughput',
     'device/audio_test_freertos',
     'device/dfu_runtime',
diff --git a/test/hil/tinyusb.json b/test/hil/tinyusb.json
index 41d94bc00..ccf81c582 100644
--- a/test/hil/tinyusb.json
+++ b/test/hil/tinyusb.json
@@ -493,6 +493,21 @@
                 "uid": "BC4954081051",
                 "args": ""
             }
+        },
+        {
+            "name": "ch582m_evt",
+            "uid": "0123456789ABCDEF",
+            "toolchain": "riscv-gcc",
+            "tests": {
+                "device": true,
+                "host": false,
+                "dual": false
+            },
+            "flasher": {
+                "name": "openocd_wch",
+                "uid": "7FD88F0604B5",
+                "args": ""
+            }
         }
     ],
     "boards-skip": [