diff --git a/cpu/riscv_common/Kconfig b/cpu/riscv_common/Kconfig
index a934e0d37e..cbc283c1f9 100644
--- a/cpu/riscv_common/Kconfig
+++ b/cpu/riscv_common/Kconfig
@@ -11,7 +11,7 @@ config CPU_ARCH_RISCV
     select HAS_LIBSTDCPP
     select HAS_NEWLIB
     select HAS_PERIPH_CORETIMER
-    select HAS_PICOLIBC if '$(RIOT_CI_BUILD)' != '1'
+    select HAS_PICOLIBC
     select HAS_PUF_SRAM
     select HAS_RUST_TARGET
     select HAS_SSP
diff --git a/cpu/riscv_common/Makefile.features b/cpu/riscv_common/Makefile.features
index eaa1848809..174b9d04da 100644
--- a/cpu/riscv_common/Makefile.features
+++ b/cpu/riscv_common/Makefile.features
@@ -13,6 +13,4 @@ FEATURES_PROVIDED += rust_target
 FEATURES_PROVIDED += ssp
 
 # RISC-V toolchain on CI does not work properly with picolibc yet
-ifeq (,$(RIOT_CI_BUILD))
-  FEATURES_PROVIDED += picolibc
-endif
+FEATURES_PROVIDED += picolibc