diff --git a/boards/cc2538dk/Makefile.features b/boards/cc2538dk/Makefile.features
index a326030628..42f40abd5f 100644
--- a/boards/cc2538dk/Makefile.features
+++ b/boards/cc2538dk/Makefile.features
@@ -1 +1 @@
-FEATURES_PROVIDED = periph_gpio periph_random
+FEATURES_PROVIDED = periph_gpio periph_random periph_cpuid
diff --git a/boards/native/Makefile.features b/boards/native/Makefile.features
index 762734b956..91747cc078 100644
--- a/boards/native/Makefile.features
+++ b/boards/native/Makefile.features
@@ -1 +1 @@
-FEATURES_PROVIDED = transceiver
+FEATURES_PROVIDED = transceiver periph_cpuid
diff --git a/boards/pca10000/Makefile.features b/boards/pca10000/Makefile.features
index 3bae27ea31..c21f92a56a 100644
--- a/boards/pca10000/Makefile.features
+++ b/boards/pca10000/Makefile.features
@@ -1 +1 @@
-FEATURES_PROVIDED = periph_gpio periph_random periph_rtt
+FEATURES_PROVIDED = periph_gpio periph_random periph_rtt periph_cpuid
diff --git a/boards/pca10005/Makefile.features b/boards/pca10005/Makefile.features
index 3bae27ea31..c21f92a56a 100644
--- a/boards/pca10005/Makefile.features
+++ b/boards/pca10005/Makefile.features
@@ -1 +1 @@
-FEATURES_PROVIDED = periph_gpio periph_random periph_rtt
+FEATURES_PROVIDED = periph_gpio periph_random periph_rtt periph_cpuid
diff --git a/boards/yunjia-nrf51822/Makefile.features b/boards/yunjia-nrf51822/Makefile.features
index 3bae27ea31..c21f92a56a 100644
--- a/boards/yunjia-nrf51822/Makefile.features
+++ b/boards/yunjia-nrf51822/Makefile.features
@@ -1 +1 @@
-FEATURES_PROVIDED = periph_gpio periph_random periph_rtt
+FEATURES_PROVIDED = periph_gpio periph_random periph_rtt periph_cpuid
diff --git a/tests/periph_cpuid/Makefile b/tests/periph_cpuid/Makefile
index f85cbd9e8e..e078803205 100644
--- a/tests/periph_cpuid/Makefile
+++ b/tests/periph_cpuid/Makefile
@@ -1,6 +1,6 @@
 export APPLICATION = periph_cpuid
 include ../Makefile.tests_common
 
-#BOARD_WHITELIST := native
+FEATURES_REQUIRED = periph_cpuid
 
 include $(RIOTBASE)/Makefile.include