diff --git a/makefiles/features_modules.inc.mk b/makefiles/features_modules.inc.mk
index 4ff401c1a0..38462db9ab 100644
--- a/makefiles/features_modules.inc.mk
+++ b/makefiles/features_modules.inc.mk
@@ -21,6 +21,9 @@ endif
 # select cpu_check_address pseudomodule if the corresponding feature is used
 USEMODULE += $(filter cpu_check_address, $(FEATURES_USED))
 
+# include puf_sram if used
+USEMODULE += $(filter puf_sram, $(FEATURES_USED))
+
 # include periph_common if any periph_* driver is used
 ifneq (,$(filter periph_%, $(USEMODULE)))
   USEMODULE += periph_common
diff --git a/tests/puf_sram/Makefile b/tests/puf_sram/Makefile
index 5ab039b749..49f346746e 100644
--- a/tests/puf_sram/Makefile
+++ b/tests/puf_sram/Makefile
@@ -2,7 +2,7 @@ BOARD ?= nucleo-f411re
 
 include ../Makefile.tests_common
 
-USEMODULE += puf_sram
+FEATURES_REQUIRED += puf_sram
 DISABLE_MODULE += test_utils_interactive_sync
 
 include $(RIOTBASE)/Makefile.include