diff --git a/boards/sipeed-longan-nano/Kconfig b/boards/sipeed-longan-nano/Kconfig
index 4ba3dc7ac5..b93a2c5239 100644
--- a/boards/sipeed-longan-nano/Kconfig
+++ b/boards/sipeed-longan-nano/Kconfig
@@ -28,7 +28,9 @@ config BOARD_SIPEED_LONGAN_NANO
 
     select HAVE_MTD_SDCARD_DEFAULT
     select MODULE_FATFS_VFS if MODULE_VFS_DEFAULT
-    select PACKAGE_TINYUSB if TEST_KCONFIG
+    select MODULE_USBUS if TEST_KCONFIG && !PACKAGE_TINYUSB
+    select MODULE_USBUS_CDC_ACM if MODULE_USBUS
+    select MODULE_USB_BOARD_RESET if MODULE_USBUS_CDC_ACM || MODULE_TINYUSB_CLASS_CDC
 
 menu "Sipeed Longan Nano Board Configuration"
 
@@ -40,6 +42,7 @@ menu "Sipeed Longan Nano Board Configuration"
 endmenu
 
 choice STDIO_IMPLEMENTATION
+    default MODULE_STDIO_CDC_ACM if MODULE_USBUS
     default MODULE_STDIO_TINYUSB_CDC_ACM if PACKAGE_TINYUSB
 endchoice
 
diff --git a/boards/sipeed-longan-nano/Makefile.dep b/boards/sipeed-longan-nano/Makefile.dep
index 04e964449b..6a80d00e25 100644
--- a/boards/sipeed-longan-nano/Makefile.dep
+++ b/boards/sipeed-longan-nano/Makefile.dep
@@ -12,5 +12,5 @@ ifneq (,$(filter vfs_default,$(USEMODULE)))
   USEMODULE += mtd
 endif
 
-include $(RIOTBOARD)/common/makefiles/stdio_tinyusb_cdc_acm.dep.mk
+include $(RIOTBOARD)/common/makefiles/stdio_cdc_acm.dep.mk
 include $(RIOTBOARD)/common/gd32v/Makefile.dep
diff --git a/tests/usbus_cdc_ecm/Makefile b/tests/usbus_cdc_ecm/Makefile
index 63a8307c92..94d1566a18 100644
--- a/tests/usbus_cdc_ecm/Makefile
+++ b/tests/usbus_cdc_ecm/Makefile
@@ -12,6 +12,7 @@ USEMODULE += ps
 # Boards that don't have enough endpoints to use CDC ACM together with CDC ECM
 ifeq (,$(filter stdio_%,$(filter-out stdio_cdc_acm,$(USEMODULE))))
   BOARD_BLACKLIST += \
+    sipeed-longan-nano \
     seeedstudio-gd32 \
     stm32f4discovery \
     weact-f401cc \