diff --git a/boards/nucleo32-f031/Makefile b/boards/nucleo-f031k6/Makefile
similarity index 100%
rename from boards/nucleo32-f031/Makefile
rename to boards/nucleo-f031k6/Makefile
diff --git a/boards/nucleo32-f031/Makefile.dep b/boards/nucleo-f031k6/Makefile.dep
similarity index 100%
rename from boards/nucleo32-f031/Makefile.dep
rename to boards/nucleo-f031k6/Makefile.dep
diff --git a/boards/nucleo32-f031/Makefile.features b/boards/nucleo-f031k6/Makefile.features
similarity index 100%
rename from boards/nucleo32-f031/Makefile.features
rename to boards/nucleo-f031k6/Makefile.features
diff --git a/boards/nucleo32-f031/Makefile.include b/boards/nucleo-f031k6/Makefile.include
similarity index 100%
rename from boards/nucleo32-f031/Makefile.include
rename to boards/nucleo-f031k6/Makefile.include
diff --git a/boards/nucleo32-f031/include/periph_conf.h b/boards/nucleo-f031k6/include/periph_conf.h
similarity index 96%
rename from boards/nucleo32-f031/include/periph_conf.h
rename to boards/nucleo-f031k6/include/periph_conf.h
index 28f484678c69fe66ac668fa8dcf8d08baa9a1d51..5779589aec6ed4662ab939f70eb8bc4483e30c4f 100644
--- a/boards/nucleo32-f031/include/periph_conf.h
+++ b/boards/nucleo-f031k6/include/periph_conf.h
@@ -7,13 +7,13 @@
*/
/**
- * @defgroup boards_nucleo32-f031 STM32 Nucleo32-F031
+ * @defgroup boards_nucleo-f031k6 STM32 Nucleo-F031K6
* @ingroup boards_common_nucleo32
- * @brief Support for the STM32 Nucleo32-F031
+ * @brief Support for the STM32 Nucleo-F031K6
* @{
*
* @file
- * @brief Peripheral MCU configuration for the nucleo32-f031 board
+ * @brief Peripheral MCU configuration for the nucleo-f031k6 board
*
* @author Alexandre Abadie <alexandre.abadie@inria.fr>
* @author Vincent Dupont <vincent@otakeys.com>
diff --git a/cpu/stm32f0/Makefile.features b/cpu/stm32f0/Makefile.features
index 8d7a3af1ada8697e2b1d5c8633da2d69e3677d54..d286ea06f23ab207993df550a7d7cf0e760ee7a4 100644
--- a/cpu/stm32f0/Makefile.features
+++ b/cpu/stm32f0/Makefile.features
@@ -1,4 +1,4 @@
-ifeq (,$(filter nucleo32-f031,$(BOARD)))
+ifeq (,$(filter nucleo-f031k6,$(BOARD)))
FEATURES_PROVIDED += periph_flashpage
FEATURES_PROVIDED += periph_flashpage_raw
endif
diff --git a/examples/dtls-echo/Makefile b/examples/dtls-echo/Makefile
index 80b64a86fadeb87ca5a8a3cffa9facf2ee8db0f6..95b8d027ef1f8bf21842027670c0756d1e5de494 100644
--- a/examples/dtls-echo/Makefile
+++ b/examples/dtls-echo/Makefile
@@ -14,7 +14,7 @@ BOARD_BLACKLIST := arduino-duemilanove arduino-mega2560 arduino-uno chronos \
BOARD_INSUFFICIENT_MEMORY := airfy-beacon b-l072z-lrwan1 bluepill calliope-mini \
cc2650-launchpad cc2650stk maple-mini \
- microbit nrf51dongle nrf6310 nucleo32-f031 \
+ microbit nrf51dongle nrf6310 nucleo-f031k6 \
nucleo32-f042 nucleo32-f303 nucleo32-l031 nucleo-f030r8 \
nucleo-f070rb nucleo-f072rb nucleo-f103rb nucleo-f302r8 nucleo-f334r8 \
nucleo-l053r8 nucleo-l073rz opencm904 \
diff --git a/examples/emcute_mqttsn/Makefile b/examples/emcute_mqttsn/Makefile
index a26fa505521eee0ddf85873a950405e1baa3a2fb..8b8dc906d9ed7da384772f7ecde98730fa1082f9 100644
--- a/examples/emcute_mqttsn/Makefile
+++ b/examples/emcute_mqttsn/Makefile
@@ -8,7 +8,7 @@ BOARD ?= native
RIOTBASE ?= $(CURDIR)/../..
BOARD_INSUFFICIENT_MEMORY := arduino-duemilanove arduino-mega2560 arduino-uno \
- chronos msb-430 msb-430h nucleo32-f031 nucleo32-f042 \
+ chronos msb-430 msb-430h nucleo-f031k6 nucleo32-f042 \
nucleo32-f303 nucleo32-l031 nucleo-f030r8 nucleo-f070rb \
nucleo-f072rb nucleo-f302r8 nucleo-f334r8 nucleo-l053r8 \
stm32f0discovery telosb waspmote-pro wsn430-v1_3b \
diff --git a/examples/filesystem/Makefile b/examples/filesystem/Makefile
index 0e0448e45f7cacfb04e85d5335fc5098e457b83b..69034e3a606af023e34719decb17ec56c489c4ca 100644
--- a/examples/filesystem/Makefile
+++ b/examples/filesystem/Makefile
@@ -14,7 +14,7 @@ BOARD_BLACKLIST := chronos \
z1 \
#
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
# This has to be the absolute path to the RIOT base directory:
RIOTBASE ?= $(CURDIR)/../..
diff --git a/examples/gcoap/Makefile b/examples/gcoap/Makefile
index c8016441b833de838e54666b53c19f628e99ec57..d9b76b9400009edee577e45abb618721a14abdcd 100644
--- a/examples/gcoap/Makefile
+++ b/examples/gcoap/Makefile
@@ -9,7 +9,7 @@ BOARD ?= native
# This has to be the absolute path to the RIOT base directory:
RIOTBASE ?= $(CURDIR)/../..
-BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo32-f031 nucleo32-f042 \
+BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f031k6 nucleo32-f042 \
nucleo32-l031 nucleo-f030r8 nucleo-f334r8 nucleo-l053r8 \
stm32f0discovery telosb wsn430-v1_3b wsn430-v1_4 z1
diff --git a/examples/gnrc_border_router/Makefile b/examples/gnrc_border_router/Makefile
index 2049cab5a87589b3a5eac7600ec225ad17f3d07f..5a258af68735d67fc67ead2e94c2a36f6cf19ac0 100644
--- a/examples/gnrc_border_router/Makefile
+++ b/examples/gnrc_border_router/Makefile
@@ -10,7 +10,7 @@ RIOTBASE ?= $(CURDIR)/../..
BOARD_INSUFFICIENT_MEMORY := airfy-beacon b-l072z-lrwan1 bluepill calliope-mini \
cc2650-launchpad cc2650stk maple-mini \
microbit msb-430 msb-430h nrf51dongle nrf6310 \
- nucleo32-f031 nucleo32-f042 nucleo32-f303 nucleo32-l031 \
+ nucleo-f031k6 nucleo32-f042 nucleo32-f303 nucleo32-l031 \
nucleo-f030r8 nucleo-f070rb nucleo-f072rb nucleo-f103rb nucleo-f302r8 \
nucleo-f334r8 nucleo-l053r8 nucleo-l073rz opencm904 \
spark-core stm32f0discovery telosb weio wsn430-v1_3b \
diff --git a/examples/gnrc_minimal/Makefile b/examples/gnrc_minimal/Makefile
index 06af0dca204132eea49960ed3a573737e52fcf10..5a5b565153856dae146011e2a3b401efe575e98d 100644
--- a/examples/gnrc_minimal/Makefile
+++ b/examples/gnrc_minimal/Makefile
@@ -7,7 +7,7 @@ BOARD ?= native
# This has to be the absolute path to the RIOT base directory:
RIOTBASE ?= $(CURDIR)/../..
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
# Comment this out to disable code in RIOT that does safety checking
# which is not needed in a production environment but helps in the
diff --git a/examples/gnrc_networking/Makefile b/examples/gnrc_networking/Makefile
index 1421b42dc2dbe2b5d150ec995e82e82b246a7273..bc2e61adea363a5fc91da1891e2fed52a5d5518f 100644
--- a/examples/gnrc_networking/Makefile
+++ b/examples/gnrc_networking/Makefile
@@ -8,7 +8,7 @@ BOARD ?= native
RIOTBASE ?= $(CURDIR)/../..
BOARD_INSUFFICIENT_MEMORY := calliope-mini chronos microbit msb-430 msb-430h \
- nucleo32-f031 nucleo32-f042 nucleo32-f303 nucleo32-l031 \
+ nucleo-f031k6 nucleo32-f042 nucleo32-f303 nucleo32-l031 \
nucleo-f030r8 nucleo-f070rb nucleo-f072rb nucleo-f103rb nucleo-f302r8 \
nucleo-f334r8 nucleo-l053r8 spark-core stm32f0discovery telosb \
wsn430-v1_3b wsn430-v1_4 z1
diff --git a/examples/gnrc_tftp/Makefile b/examples/gnrc_tftp/Makefile
index 6e7c6fc425bb606dec6585b15aef305d35e3789e..e13ef2b094ed3983a72323408178decbf3b2fac0 100644
--- a/examples/gnrc_tftp/Makefile
+++ b/examples/gnrc_tftp/Makefile
@@ -8,7 +8,7 @@ BOARD ?= native
RIOTBASE ?= $(CURDIR)/../..
BOARD_INSUFFICIENT_MEMORY := airfy-beacon b-l072z-lrwan1 bluepill calliope-mini chronos \
- microbit msb-430 msb-430h nrf51dongle nrf6310 nucleo32-f031 \
+ microbit msb-430 msb-430h nrf51dongle nrf6310 nucleo-f031k6 \
nucleo32-f042 nucleo32-f303 nucleo32-l031 nucleo-f030r8 \
nucleo-f070rb nucleo-f072rb nucleo-f103rb nucleo-f302r8 nucleo-f334r8 \
nucleo-l053r8 spark-core stm32f0discovery \
diff --git a/examples/ipc_pingpong/Makefile b/examples/ipc_pingpong/Makefile
index 076599cbf308b2ff0f917e73923cd8e5cee93c47..03828548a90b879847c035b85a3f05b54aca2074 100644
--- a/examples/ipc_pingpong/Makefile
+++ b/examples/ipc_pingpong/Makefile
@@ -4,7 +4,7 @@ APPLICATION = ipc_pingpong
# If no BOARD is found in the environment, use this default:
BOARD ?= native
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
# This has to be the absolute path to the RIOT base directory:
RIOTBASE ?= $(CURDIR)/../..
diff --git a/examples/javascript/Makefile b/examples/javascript/Makefile
index 2446d9ca3cc9d8a319603519af4657abea2710a9..827dc0c63eb27c3b299fc777dc47e9961b8005ad 100644
--- a/examples/javascript/Makefile
+++ b/examples/javascript/Makefile
@@ -11,7 +11,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon b-l072z-lrwan1 bluepill calliope-mini
cc2650-launchpad cc2650stk maple-mini \
microbit nrf51dongle nrf6310 nucleo-f030r8 nucleo-f070rb \
nucleo-f072rb nucleo-f103rb nucleo-f302r8 nucleo-f334r8 nucleo-f410rb \
- nucleo-l053r8 nucleo-l073rz nucleo32-f031 nucleo32-f042 \
+ nucleo-l053r8 nucleo-l073rz nucleo-f031k6 nucleo32-f042 \
nucleo32-f303 nucleo32-l031 opencm904 \
spark-core stm32f0discovery yunjia-nrf51822 \
diff --git a/examples/nanocoap_server/Makefile b/examples/nanocoap_server/Makefile
index 817f833b6e2cdb16ea8503d1cd1cb29296e164bf..5289a3f226b53a7e7247030d9de24adde11a5dfb 100644
--- a/examples/nanocoap_server/Makefile
+++ b/examples/nanocoap_server/Makefile
@@ -7,7 +7,7 @@ BOARD ?= native
# This has to be the absolute path to the RIOT base directory:
RIOTBASE ?= $(CURDIR)/../..
-BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo32-f031 nucleo32-f042 \
+BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f031k6 nucleo32-f042 \
nucleo32-l031 nucleo-f030r8 nucleo-l053r8 stm32f0discovery \
telosb z1
diff --git a/examples/posix_sockets/Makefile b/examples/posix_sockets/Makefile
index fd8d870a44388bbe7add14c00ee3384dd8cf65c6..d627b1ae978cf3ca0909b9d1f6b53b745aa971c4 100644
--- a/examples/posix_sockets/Makefile
+++ b/examples/posix_sockets/Makefile
@@ -8,7 +8,7 @@ BOARD ?= native
RIOTBASE ?= $(CURDIR)/../..
BOARD_INSUFFICIENT_MEMORY := airfy-beacon chronos msb-430 msb-430h nrf51dongle \
- nrf6310 nucleo32-f031 nucleo32-f042 nucleo32-l031 \
+ nrf6310 nucleo-f031k6 nucleo32-f042 nucleo32-l031 \
nucleo-f030r8 nucleo-f070rb nucleo-f072rb nucleo-f334r8 \
nucleo-l053r8 stm32f0discovery telosb \
wsn430-v1_3b wsn430-v1_4 yunjia-nrf51822 z1
diff --git a/examples/rdcli_simple/Makefile b/examples/rdcli_simple/Makefile
index d28ecbd9fb7794ac94b9c7f0a22f2bacefaed8b8..1074f763aca8b6764ca9722a986d9cf8d572094d 100644
--- a/examples/rdcli_simple/Makefile
+++ b/examples/rdcli_simple/Makefile
@@ -8,7 +8,7 @@ BOARD ?= native
RIOTBASE ?= $(CURDIR)/../..
BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f030r8 nucleo-l053r8 \
- nucleo32-f031 nucleo32-f042 nucleo32-l031 \
+ nucleo-f031k6 nucleo32-f042 nucleo32-l031 \
stm32f0discovery telosb wsn430-v1_3b wsn430-v1_4 \
z1
diff --git a/examples/riot_and_cpp/Makefile b/examples/riot_and_cpp/Makefile
index b31d2bd2cbe6543bc6ccface021ebe995c0ab223..e0493d85fbf5748b1c6d472045311e6528822dbf 100644
--- a/examples/riot_and_cpp/Makefile
+++ b/examples/riot_and_cpp/Makefile
@@ -6,7 +6,7 @@ BOARD ?= native
# stm32f0discovery objects are too big with ARM Embedded Toolchain v4.9.3 20141119
# (used currently by travis)
-BOARD_INSUFFICIENT_MEMORY= nucleo32-f031 nucleo32-f042 stm32f0discovery
+BOARD_INSUFFICIENT_MEMORY= nucleo-f031k6 nucleo32-f042 stm32f0discovery
# This has to be the absolute path to the RIOT base directory:
RIOTBASE ?= $(CURDIR)/../..
diff --git a/tests/cbor/Makefile b/tests/cbor/Makefile
index f1cca316d3dba19f0f878ff1d85367571de82ce4..e81b1b649882751c55f4f13d1824764c7d86b2de 100644
--- a/tests/cbor/Makefile
+++ b/tests/cbor/Makefile
@@ -5,7 +5,7 @@ BOARD_BLACKLIST += chronos
BOARD_BLACKLIST += mega-xplained
BOARD_BLACKLIST += mips-malta
BOARD_BLACKLIST += msb-430 msb-430h
-BOARD_BLACKLIST += nucleo32-f031
+BOARD_BLACKLIST += nucleo-f031k6
BOARD_BLACKLIST += pic32-clicker pic32-wifire
BOARD_BLACKLIST += telosb
BOARD_BLACKLIST += waspmote-pro
diff --git a/tests/conn_can/Makefile b/tests/conn_can/Makefile
index 98627638c4cd4d2e931e2b41c3904daf125e212d..1ebd271418de24670bab0e04f280031cd38fcf1f 100644
--- a/tests/conn_can/Makefile
+++ b/tests/conn_can/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo32-f031 nucleo32-f042 \
+BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f031k6 nucleo32-f042 \
nucleo32-f303 nucleo32-l031 nucleo-f030r8 nucleo-f070rb \
nucleo-f072rb nucleo-f302r8 nucleo-f303re nucleo-f334r8 \
nucleo-l053r8 stm32f0discovery telosb wsn430-v1_3b \
diff --git a/tests/driver_at86rf2xx/Makefile b/tests/driver_at86rf2xx/Makefile
index 5bcf0fa9aa513dddd62d0a5349fc545c6b333e26..3271fe31cd85fad78cd993e5bd42a38f4688eefd 100644
--- a/tests/driver_at86rf2xx/Makefile
+++ b/tests/driver_at86rf2xx/Makefile
@@ -1,7 +1,7 @@
include ../Makefile.tests_common
# exclude boards with insufficient memory
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
FEATURES_REQUIRED = periph_spi periph_gpio
diff --git a/tests/driver_enc28j60/Makefile b/tests/driver_enc28j60/Makefile
index 7053547fe676db26eae66394b9ae3c1ec02a4d84..8f79496addbd0db68effa30ccead5a5eee2f27bd 100644
--- a/tests/driver_enc28j60/Makefile
+++ b/tests/driver_enc28j60/Makefile
@@ -1,7 +1,7 @@
include ../Makefile.tests_common
BOARD_INSUFFICIENT_MEMORY := msb-430 msb-430h nucleo-f334r8 nucleo-l053r8 \
- nucleo32-f031 nucleo32-f042 nucleo32-l031 \
+ nucleo-f031k6 nucleo32-f042 nucleo32-l031 \
stm32f0discovery telosb wsn430-v1_3b wsn430-v1_4 \
z1
diff --git a/tests/driver_encx24j600/Makefile b/tests/driver_encx24j600/Makefile
index ee01bd4a23d137285acbfe55e230e88491911d4d..e9cebf8012cdb67b41b8a53fa4c2a7999bc95722 100644
--- a/tests/driver_encx24j600/Makefile
+++ b/tests/driver_encx24j600/Makefile
@@ -1,7 +1,7 @@
include ../Makefile.tests_common
BOARD_INSUFFICIENT_MEMORY := msb-430 msb-430h \
- nucleo-l053r8 nucleo32-f031 nucleo32-f042 \
+ nucleo-l053r8 nucleo-f031k6 nucleo32-f042 \
nucleo32-l031 stm32f0discovery telosb \
wsn430-v1_3b wsn430-v1_4 z1
diff --git a/tests/driver_kw2xrf/Makefile b/tests/driver_kw2xrf/Makefile
index 624568437bc1fb6077063cbc51d727891e85819a..fd9218b81ce6b2ec161366b9ff9760756de843fd 100644
--- a/tests/driver_kw2xrf/Makefile
+++ b/tests/driver_kw2xrf/Makefile
@@ -2,7 +2,7 @@ include ../Makefile.tests_common
FEATURES_REQUIRED = periph_spi periph_gpio
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031 nucleo32-f042 nucleo32-l031 \
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo32-f042 nucleo32-l031 \
nucleo-f334r8 nucleo-l053r8 stm32f0discovery
USEMODULE += auto_init_gnrc_netif
diff --git a/tests/driver_nrf24l01p_lowlevel/Makefile b/tests/driver_nrf24l01p_lowlevel/Makefile
index db0f5a4563d3cf4edc9a5c08f5f4e1e33bef3a11..5062b64ca43ce6fbe813f97715b044c623cb3b23 100644
--- a/tests/driver_nrf24l01p_lowlevel/Makefile
+++ b/tests/driver_nrf24l01p_lowlevel/Makefile
@@ -1,7 +1,7 @@
include ../Makefile.tests_common
# exclude boards with insufficient memory
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
FEATURES_REQUIRED = periph_spi
diff --git a/tests/driver_pir/Makefile b/tests/driver_pir/Makefile
index 3604c54827f7bb286b35df15cdc49dabcaf2f479..54ca113e5bfe1c8afe55b861d58b1986ccf50253 100644
--- a/tests/driver_pir/Makefile
+++ b/tests/driver_pir/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
FEATURES_REQUIRED = periph_gpio
diff --git a/tests/driver_sdcard_spi/Makefile b/tests/driver_sdcard_spi/Makefile
index a2eaf66d6342de79f8f210b0e61b7d477efb2c10..e1e25a67b3e81436f9ded20316129341f3132fa0 100644
--- a/tests/driver_sdcard_spi/Makefile
+++ b/tests/driver_sdcard_spi/Makefile
@@ -1,7 +1,7 @@
include ../Makefile.tests_common
# exclude boards with insufficient memory
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
USEMODULE += sdcard_spi
USEMODULE += auto_init_storage
diff --git a/tests/driver_sx127x/Makefile b/tests/driver_sx127x/Makefile
index 244354698ce2712a4884746ca6b1863f4bfc431e..d8340a50ab0d2ecd69b1c9fb72ed288d7ed75dcb 100644
--- a/tests/driver_sx127x/Makefile
+++ b/tests/driver_sx127x/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
BOARD ?= nucleo-l152re
diff --git a/tests/driver_xbee/Makefile b/tests/driver_xbee/Makefile
index 99015347c0beb6e3522282a7ad6077000da8d480..6202b65f165342a025cfecbf202007f280abc64c 100644
--- a/tests/driver_xbee/Makefile
+++ b/tests/driver_xbee/Makefile
@@ -2,7 +2,7 @@ include ../Makefile.tests_common
FEATURES_REQUIRED = periph_uart periph_gpio
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031 nucleo32-f042 nucleo-f030r8 nucleo-f334r8 \
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo32-f042 nucleo-f030r8 nucleo-f334r8 \
stm32f0discovery
USEMODULE += xbee
diff --git a/tests/emb6/Makefile b/tests/emb6/Makefile
index 1c8cbcbd02a685ed60d2e5d4cf988cfd7f80036f..61147ae9b4e5518a68d57ede4b4d1fb7fd58acec 100644
--- a/tests/emb6/Makefile
+++ b/tests/emb6/Makefile
@@ -5,7 +5,7 @@ include ../Makefile.tests_common
# MSP-430 doesn't support C11's atomic functionality yet
BOARD_BLACKLIST := msb-430 msb-430h telosb wsn430-v1_3b wsn430-v1_4 z1
-BOARD_INSUFFICIENT_MEMORY := msb-430 msb-430h nucleo32-l031 nucleo32-f031 \
+BOARD_INSUFFICIENT_MEMORY := msb-430 msb-430h nucleo32-l031 nucleo-f031k6 \
nucleo32-f042 nucleo-l053r8 stm32f0discovery telosb \
wsn430-v1_3b wsn430-v1_4 z1
diff --git a/tests/evtimer_msg/Makefile b/tests/evtimer_msg/Makefile
index e072d24c62dce925f75643bbf99d79392aae21fb..dcd65f6d54ad707557ea4e86699fc25dfa69659b 100644
--- a/tests/evtimer_msg/Makefile
+++ b/tests/evtimer_msg/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031 nucleo32-f042
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo32-f042
USEMODULE += evtimer
diff --git a/tests/evtimer_underflow/Makefile b/tests/evtimer_underflow/Makefile
index e072d24c62dce925f75643bbf99d79392aae21fb..dcd65f6d54ad707557ea4e86699fc25dfa69659b 100644
--- a/tests/evtimer_underflow/Makefile
+++ b/tests/evtimer_underflow/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031 nucleo32-f042
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo32-f042
USEMODULE += evtimer
diff --git a/tests/gnrc_ipv6_ext/Makefile b/tests/gnrc_ipv6_ext/Makefile
index ed7d57a277799a7b2cc0713ee0254343a05b4759..61d0f60d1f85e7a0936d23728ebdeac3c9676ac2 100644
--- a/tests/gnrc_ipv6_ext/Makefile
+++ b/tests/gnrc_ipv6_ext/Makefile
@@ -2,7 +2,7 @@
include ../Makefile.tests_common
BOARD_INSUFFICIENT_MEMORY := airfy-beacon chronos maple-mini msb-430 msb-430h \
- nrf51dongle nrf6310 nucleo32-f031 nucleo32-f042 \
+ nrf51dongle nrf6310 nucleo-f031k6 nucleo32-f042 \
nucleo32-l031 nucleo-f030r8 nucleo-f103rb nucleo-f334r8 nucleo-l053r8 \
spark-core stm32f0discovery telosb \
wsn430-v1_3b wsn430-v1_4 yunjia-nrf51822 z1
diff --git a/tests/gnrc_ipv6_nib/Makefile b/tests/gnrc_ipv6_nib/Makefile
index 4bf72e32384aa5cf6868127de40793ed110edb5f..071a0246de2b23912f9b85401422f7d6b99c783e 100644
--- a/tests/gnrc_ipv6_nib/Makefile
+++ b/tests/gnrc_ipv6_nib/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := chronos nucleo32-f031 nucleo32-f042 nucleo32-l031 \
+BOARD_INSUFFICIENT_MEMORY := chronos nucleo-f031k6 nucleo32-f042 nucleo32-l031 \
telosb wsn430-v1_3b wsn430-v1_4
USEMODULE += gnrc_ipv6
diff --git a/tests/gnrc_ipv6_nib_6ln/Makefile b/tests/gnrc_ipv6_nib_6ln/Makefile
index 66782d638625052939a3bcc4bc4c63a2a244d932..793f390bbc549b870511695f9ee0424ee8bcd20b 100644
--- a/tests/gnrc_ipv6_nib_6ln/Makefile
+++ b/tests/gnrc_ipv6_nib_6ln/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := chronos nucleo-f030r8 nucleo-l053r8 nucleo32-f031 \
+BOARD_INSUFFICIENT_MEMORY := chronos nucleo-f030r8 nucleo-l053r8 nucleo-f031k6 \
nucleo32-l031 nucleo32-f042 stm32f0discovery \
telosb wsn430-v1_3b wsn430-v1_4
diff --git a/tests/gnrc_ndp/Makefile b/tests/gnrc_ndp/Makefile
index ec6a2cf41f9dd8d74cc44507d129a1e0c07d488c..697fe6c4463ca25bf6195d57e0d66987fd991a82 100644
--- a/tests/gnrc_ndp/Makefile
+++ b/tests/gnrc_ndp/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := chronos nucleo32-f031 nucleo32-f042 nucleo32-l031 \
+BOARD_INSUFFICIENT_MEMORY := chronos nucleo-f031k6 nucleo32-f042 nucleo32-l031 \
telosb wsn430-v1_3b wsn430-v1_4
USEMODULE += gnrc_ipv6_nib_router
diff --git a/tests/gnrc_netif/Makefile b/tests/gnrc_netif/Makefile
index 6f1272bdf6e47f0ac2e3212d3f6c197cac7b6659..4d37aee249b01ed591431378943db876299bc38d 100644
--- a/tests/gnrc_netif/Makefile
+++ b/tests/gnrc_netif/Makefile
@@ -5,7 +5,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon b-l072z-lrwan1 bluepill calliope-mini
microbit msb-430 msb-430h nrf51dongle nrf6310 \
nucleo-f030r8 nucleo-f070rb nucleo-f072rb nucleo-f103rb \
nucleo-f302r8 nucleo-f334r8 nucleo-l053r8 nucleo-l073rz \
- nucleo32-f031 nucleo32-f042 nucleo32-f303 \
+ nucleo-f031k6 nucleo32-f042 nucleo32-f303 \
nucleo32-l031 opencm904 spark-core \
stm32f0discovery telosb wsn430-v1_3b wsn430-v1_4 \
yunjia-nrf51822 z1
diff --git a/tests/gnrc_sixlowpan/Makefile b/tests/gnrc_sixlowpan/Makefile
index 81d77b0542c55c4146cad73bcc9dfd95033c0c92..5a48b201c6cf5540cdd3ba640590e2f654d17a68 100644
--- a/tests/gnrc_sixlowpan/Makefile
+++ b/tests/gnrc_sixlowpan/Makefile
@@ -2,7 +2,7 @@
include ../Makefile.tests_common
BOARD_INSUFFICIENT_MEMORY := airfy-beacon chronos maple-mini msb-430 msb-430h \
- nrf51dongle nrf6310 nucleo32-f031 nucleo32-f042 \
+ nrf51dongle nrf6310 nucleo-f031k6 nucleo32-f042 \
nucleo32-l031 nucleo-f030r8 nucleo-f070rb nucleo-f103rb \
nucleo-f334r8 nucleo-l053r8 spark-core \
stm32f0discovery telosb wsn430-v1_3b wsn430-v1_4 \
diff --git a/tests/gnrc_sock_dns/Makefile b/tests/gnrc_sock_dns/Makefile
index 8e3ca8574d6f744cdd54628163a668879970618d..b2966525502bedde290ae69b04c1af14c27ebe4d 100644
--- a/tests/gnrc_sock_dns/Makefile
+++ b/tests/gnrc_sock_dns/Makefile
@@ -2,7 +2,7 @@ include ../Makefile.tests_common
RIOTBASE ?= $(CURDIR)/../..
-BOARD_INSUFFICIENT_MEMORY := chronos telosb nucleo32-f042 nucleo32-f031 \
+BOARD_INSUFFICIENT_MEMORY := chronos telosb nucleo32-f042 nucleo-f031k6 \
nucleo-f030r8 nucleo-l053r8 nucleo32-l031 \
stm32f0discovery z1
diff --git a/tests/gnrc_sock_ip/Makefile b/tests/gnrc_sock_ip/Makefile
index 4d8aa5a21bca1a49c6cee80869e86c8448532fe1..7cc27d56ab66e1641fcc9a9e01e6c070abf842bc 100644
--- a/tests/gnrc_sock_ip/Makefile
+++ b/tests/gnrc_sock_ip/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := chronos nucleo32-f031 nucleo32-f042 nucleo32-l031
+BOARD_INSUFFICIENT_MEMORY := chronos nucleo-f031k6 nucleo32-f042 nucleo32-l031
USEMODULE += gnrc_sock_ip
USEMODULE += gnrc_ipv6
diff --git a/tests/gnrc_sock_udp/Makefile b/tests/gnrc_sock_udp/Makefile
index 5b8cff466d44fcb2146ee9fcf8974b9ec7fbba52..51e196178bbc9d303ac7c9378ec77707ce596ba0 100644
--- a/tests/gnrc_sock_udp/Makefile
+++ b/tests/gnrc_sock_udp/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := chronos nucleo32-f031 nucleo32-f042 nucleo32-l031
+BOARD_INSUFFICIENT_MEMORY := chronos nucleo-f031k6 nucleo32-f042 nucleo32-l031
USEMODULE += gnrc_sock_check_reuse
USEMODULE += gnrc_sock_udp
diff --git a/tests/gnrc_tcp_client/Makefile b/tests/gnrc_tcp_client/Makefile
index 70d169e49d363f4ee631d3e3ccc488853c399ece..88e11a4098c897eab4acc2b82e2b2e8194146176 100644
--- a/tests/gnrc_tcp_client/Makefile
+++ b/tests/gnrc_tcp_client/Makefile
@@ -11,7 +11,7 @@ TCP_TEST_CYCLES ?= 3
# Mark Boards with insufficient memory
BOARD_INSUFFICIENT_MEMORY := airfy-beacon arduino-duemilanove arduino-mega2560 \
arduino-uno calliope-mini chronos mega-xplained microbit \
- msb-430 msb-430h nrf51dongle nrf6310 nucleo32-f031 \
+ msb-430 msb-430h nrf51dongle nrf6310 nucleo-f031k6 \
nucleo32-f042 nucleo32-f303 nucleo32-l031 nucleo-f030r8 \
nucleo-f070rb nucleo-f072rb nucleo-f302r8 nucleo-f334r8 nucleo-l053r8 \
sb-430 sb-430h stm32f0discovery telosb \
diff --git a/tests/gnrc_tcp_server/Makefile b/tests/gnrc_tcp_server/Makefile
index 57cbd5faeb865b99e1aa9bd24a73f356169edb75..bef29c710e60071c41310ea1fe94cbdce57a0caa 100644
--- a/tests/gnrc_tcp_server/Makefile
+++ b/tests/gnrc_tcp_server/Makefile
@@ -11,7 +11,7 @@ TCP_TEST_CYCLES ?= 3
# Mark Boards with insufficient memory
BOARD_INSUFFICIENT_MEMORY := airfy-beacon arduino-duemilanove arduino-mega2560 \
arduino-uno calliope-mini chronos mega-xplained \
- microbit msb-430 msb-430h nrf51dongle nrf6310 nucleo32-f031 \
+ microbit msb-430 msb-430h nrf51dongle nrf6310 nucleo-f031k6 \
nucleo32-f042 nucleo32-f303 nucleo32-l031 nucleo-f030r8 \
nucleo-f070rb nucleo-f072rb nucleo-f302r8 nucleo-f334r8 nucleo-l053r8 \
sb-430 sb-430h stm32f0discovery telosb \
diff --git a/tests/gnrc_udp/Makefile b/tests/gnrc_udp/Makefile
index 47960f7c677543ce0c904a40d547c3315c7cb615..9c51e89bb5280b09ebce4306774032e3ad3b68e0 100644
--- a/tests/gnrc_udp/Makefile
+++ b/tests/gnrc_udp/Makefile
@@ -1,7 +1,7 @@
include ../Makefile.tests_common
BOARD_INSUFFICIENT_MEMORY := calliope-mini chronos microbit msb-430 msb-430h \
- nucleo32-f031 nucleo32-f042 nucleo32-f303 nucleo32-l031 \
+ nucleo-f031k6 nucleo32-f042 nucleo32-f303 nucleo32-l031 \
nucleo-f030r8 nucleo-f070rb nucleo-f072rb nucleo-f103rb nucleo-f302r8 \
nucleo-f334r8 nucleo-l053r8 spark-core stm32f0discovery telosb \
wsn430-v1_3b wsn430-v1_4 z1
diff --git a/tests/irq/Makefile b/tests/irq/Makefile
index 393ea0def2726316af0ea5985af40ff8149b100c..a7530f5863e634d62bb4aacebae651d8e761a5bd 100644
--- a/tests/irq/Makefile
+++ b/tests/irq/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
USEMODULE += auto_init
USEMODULE += xtimer
diff --git a/tests/isr_yield_higher/Makefile b/tests/isr_yield_higher/Makefile
index f5124bb23b2fb3c620c6a4923a41e4921ef3ac49..38e14be8d4dd7b05a43775341df6af453bd25582 100644
--- a/tests/isr_yield_higher/Makefile
+++ b/tests/isr_yield_higher/Makefile
@@ -1,7 +1,7 @@
APPLICATION = isr_yield_higher
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
USEMODULE += xtimer
diff --git a/tests/libfixmath_unittests/Makefile b/tests/libfixmath_unittests/Makefile
index a555c5f5bcdb4742e0ae9cec941ff80274dc6f63..b3233338e3ba2b1bc7b1f2f986bb529f5884c2ca 100644
--- a/tests/libfixmath_unittests/Makefile
+++ b/tests/libfixmath_unittests/Makefile
@@ -7,7 +7,7 @@ BOARD_BLACKLIST := arduino-mega2560 waspmote-pro arduino-uno arduino-duemilanove
# The MSP boards don't feature round(), exp(), and log(), which are used in the unittests
BOARD_BLACKLIST += chronos msb-430 msb-430h telosb wsn430-v1_3b wsn430-v1_4 z1
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031 nucleo32-f042 nucleo32-l031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo32-f042 nucleo32-l031
USEMODULE += libfixmath-unittests
diff --git a/tests/lwip/Makefile b/tests/lwip/Makefile
index fcc6429f11d42c1681e3343d0dcdf76cadd751c3..4bba5a4bdcfae8b19fb054beece79f6f5e449d0f 100644
--- a/tests/lwip/Makefile
+++ b/tests/lwip/Makefile
@@ -5,7 +5,7 @@ include ../Makefile.tests_common
BOARD_BLACKLIST := arduino-uno arduino-duemilanove arduino-mega2560 chronos \
msb-430 msb-430h telosb waspmote-pro wsn430-v1_3b \
wsn430-v1_4 z1 jiminy-mega256rfr2 mega-xplained
-BOARD_INSUFFICIENT_MEMORY := airfy-beacon nrf6310 nucleo32-f031 nucleo32-f042 \
+BOARD_INSUFFICIENT_MEMORY := airfy-beacon nrf6310 nucleo-f031k6 nucleo32-f042 \
nucleo32-l031 nucleo-f030r8 nucleo-f334r8 nucleo-l053r8 \
stm32f0discovery yunjia-nrf51822
diff --git a/tests/lwip_sock_ip/Makefile b/tests/lwip_sock_ip/Makefile
index cc466f03f94de89ae09bdd54915bb10d969e4be7..e1ca2f2616890e5c6c6b8d8ca6f2e4e263c10c48 100644
--- a/tests/lwip_sock_ip/Makefile
+++ b/tests/lwip_sock_ip/Makefile
@@ -5,7 +5,7 @@ include ../Makefile.tests_common
BOARD_BLACKLIST := arduino-uno arduino-duemilanove arduino-mega2560 chronos \
msb-430 msb-430h telosb waspmote-pro wsn430-v1_3b \
wsn430-v1_4 z1 jiminy-mega256rfr2 mega-xplained
-BOARD_INSUFFICIENT_MEMORY = nucleo32-f031 nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
+BOARD_INSUFFICIENT_MEMORY = nucleo-f031k6 nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
nucleo-f334r8 nucleo-l053r8 stm32f0discovery
LWIP_IPV4 ?= 0
diff --git a/tests/lwip_sock_tcp/Makefile b/tests/lwip_sock_tcp/Makefile
index 8343e4f78c794aec6eabfd6a0ebfc85c120fa9b1..41aabd181c0adbdf96a68cc6967520e0c35d6939 100644
--- a/tests/lwip_sock_tcp/Makefile
+++ b/tests/lwip_sock_tcp/Makefile
@@ -5,7 +5,7 @@ include ../Makefile.tests_common
BOARD_BLACKLIST := arduino-uno arduino-duemilanove arduino-mega2560 chronos \
msb-430 msb-430h telosb waspmote-pro wsn430-v1_3b \
wsn430-v1_4 z1 jiminy-mega256rfr2 mega-xplained
-BOARD_INSUFFICIENT_MEMORY = nucleo32-f031 nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
+BOARD_INSUFFICIENT_MEMORY = nucleo-f031k6 nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
nucleo-f334r8 nucleo-l053r8 stm32f0discovery
LWIP_IPV4 ?= 0
diff --git a/tests/lwip_sock_udp/Makefile b/tests/lwip_sock_udp/Makefile
index b0ec658ae281a5e333645d2807f08b0a6c719a35..a3b66225ed50d04513e927b32d98022e98108520 100644
--- a/tests/lwip_sock_udp/Makefile
+++ b/tests/lwip_sock_udp/Makefile
@@ -5,7 +5,7 @@ include ../Makefile.tests_common
BOARD_BLACKLIST := arduino-uno arduino-duemilanove arduino-mega2560 chronos \
msb-430 msb-430h telosb waspmote-pro wsn430-v1_3b \
wsn430-v1_4 z1 jiminy-mega256rfr2 mega-xplained
-BOARD_INSUFFICIENT_MEMORY = nucleo32-f031 nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
+BOARD_INSUFFICIENT_MEMORY = nucleo-f031k6 nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
nucleo-f334r8 nucleo-l053r8 stm32f0discovery
LWIP_IPV4 ?= 0
diff --git a/tests/msg_send_receive/Makefile b/tests/msg_send_receive/Makefile
index dc1a4e4b8a877678ba95fa8a9fe6d15fbd0f0196..e3e9e91e635f0573b9b5ce739d095ab92ecf8baa 100644
--- a/tests/msg_send_receive/Makefile
+++ b/tests/msg_send_receive/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
TEST_ON_CI_WHITELIST += all
diff --git a/tests/msg_try_receive/Makefile b/tests/msg_try_receive/Makefile
index e69e3d5df93a0575099700b7cec73706cf6fbeb0..b72eab5acf438a296f84717290991f5f7e12b6dd 100644
--- a/tests/msg_try_receive/Makefile
+++ b/tests/msg_try_receive/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
TEST_ON_CI_WHITELIST += all
diff --git a/tests/mutex_order/Makefile b/tests/mutex_order/Makefile
index 73c2e5d6af0b6ed52c6245c1b49d102f88c70aeb..3467a84375a2481ebb233dde32406436a955070a 100644
--- a/tests/mutex_order/Makefile
+++ b/tests/mutex_order/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031 nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
nucleo-l053r8 stm32f0discovery
# list of boards to run CI tests on
diff --git a/tests/netdev_test/Makefile b/tests/netdev_test/Makefile
index 67bca28aedbed9cdeb9033327aea6ed6d2e0db4a..eae854b2527453fe1239e22c1ed7f9ef398630c7 100644
--- a/tests/netdev_test/Makefile
+++ b/tests/netdev_test/Makefile
@@ -4,7 +4,7 @@
CFLAGS += -DNDEBUG
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
DISABLE_MODULE = auto_init
diff --git a/tests/nhdp/Makefile b/tests/nhdp/Makefile
index bad81e0c9237b9b8950f0994f32586704d18162b..b1e07fc61993da0e36bd0332a63ef94eee6e0526 100644
--- a/tests/nhdp/Makefile
+++ b/tests/nhdp/Makefile
@@ -3,7 +3,7 @@ include ../Makefile.tests_common
BOARD_BLACKLIST := arduino-mega2560 chronos msb-430 msb-430h telosb \
wsn430-v1_3b wsn430-v1_4 z1 waspmote-pro arduino-uno \
arduino-duemilanove jiminy-mega256rfr2 mega-xplained
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031 nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
nucleo-f334r8 nucleo-l053r8 stm32f0discovery
USEMODULE += gnrc_ipv6
diff --git a/tests/periph_uart/Makefile b/tests/periph_uart/Makefile
index 7fcba9a9a58899ccf20c3cfb8f0832ca2cf796e4..5047bb56daa82498e3c09a278e41a419e7074c76 100644
--- a/tests/periph_uart/Makefile
+++ b/tests/periph_uart/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
FEATURES_REQUIRED = periph_uart
diff --git a/tests/pipe/Makefile b/tests/pipe/Makefile
index 7f3d01f2a3be0431dd0a4b159658c4e6ee0378af..d4b97581d8b90c1da069ebaa214ad0951d768287 100644
--- a/tests/pipe/Makefile
+++ b/tests/pipe/Makefile
@@ -2,7 +2,7 @@ include ../Makefile.tests_common
#malloc.h not found
BOARD_BLACKLIST := jiminy-mega256rfr2 mega-xplained
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
USEMODULE += pipe
diff --git a/tests/pkg_fatfs/Makefile b/tests/pkg_fatfs/Makefile
index ae3a372167199ba29dbc9402fd055a4197d7f19f..95f66be8a44425853a17502c92d0f5c8eb79b101 100644
--- a/tests/pkg_fatfs/Makefile
+++ b/tests/pkg_fatfs/Makefile
@@ -12,7 +12,7 @@ BOARD_WHITELIST := airfy-beacon arduino-due arduino-duemilanove arduino-mega2560
iotlab-m3 limifrog-v1 maple-mini msb-430 msb-430h msba2 msbiot \
mulle nrf52840dk nrf52dk nrf6310 nucleo-f207zg nucleo-f303ze \
nucleo-f412zg nucleo-f413zh nucleo-f429zi nucleo-f446ze \
- nucleo32-f031 nucleo32-f042 nucleo32-f303 nucleo32-l031 \
+ nucleo-f031k6 nucleo32-f042 nucleo32-f303 nucleo32-l031 \
nucleo32-l432 nucleo-f072rb nucleo-f091rc nucleo-f103rb nucleo-f302r8 \
nucleo-f303re nucleo-f334r8 nucleo-f401re nucleo-f410rb nucleo-f411re \
nucleo-f446re nucleo-l053r8 nucleo-l073rz nucleo-l152re nucleo-l476rg \
diff --git a/tests/pkg_fatfs_vfs/Makefile b/tests/pkg_fatfs_vfs/Makefile
index 90937d9d48ae648a8daf22b1c1c3b02a3140e9d1..6d9a851632b32037864d3f5214ce14a78aed3d90 100644
--- a/tests/pkg_fatfs_vfs/Makefile
+++ b/tests/pkg_fatfs_vfs/Makefile
@@ -25,7 +25,7 @@ else
USEMODULE += mtd_sdcard
endif
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
# this list is composed of boards with sufficient memory and support spi/gpio + native
BOARD_WHITELIST := airfy-beacon arduino-due arduino-duemilanove arduino-mega2560 \
diff --git a/tests/pkg_libcoap/Makefile b/tests/pkg_libcoap/Makefile
index 1e74806092e9016dc8ce2d4435389c45d4aede48..773726a0abcbe7a7f5660c500e9c9412607b4710 100644
--- a/tests/pkg_libcoap/Makefile
+++ b/tests/pkg_libcoap/Makefile
@@ -4,7 +4,7 @@ include ../Makefile.tests_common
BOARD_BLACKLIST := arduino-mega2560 chronos msb-430 msb-430h telosb wsn430-v1_3b \
wsn430-v1_4 z1 waspmote-pro arduino-uno arduino-duemilanove \
jiminy-mega256rfr2 mega-xplained
-BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo32-f031 nucleo32-f042 \
+BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f031k6 nucleo32-f042 \
nucleo32-l031 nucleo-f030r8 nucleo-f070rb nucleo-f334r8 nucleo-l053r8 \
stm32f0discovery telosb wsn430-v1_3b wsn430-v1_4 \
z1
diff --git a/tests/pkg_microcoap/Makefile b/tests/pkg_microcoap/Makefile
index a2927be8e3e5c355ebaa0658db787510228da5db..28cfd6665d1ebd61c60c64ca9bb02e02e6abe8c2 100644
--- a/tests/pkg_microcoap/Makefile
+++ b/tests/pkg_microcoap/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo32-f031 nucleo32-f042 \
+BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f031k6 nucleo32-f042 \
nucleo32-l031 nucleo-f030r8 nucleo-l053r8 \
stm32f0discovery telosb z1
diff --git a/tests/pkg_semtech-loramac/Makefile b/tests/pkg_semtech-loramac/Makefile
index 57ca2e96f111a872496f05028392fbbdb1d8af3c..187ca183fe330c94eb44ec65456487cf4c27609d 100644
--- a/tests/pkg_semtech-loramac/Makefile
+++ b/tests/pkg_semtech-loramac/Makefile
@@ -2,7 +2,7 @@ BOARD ?= b-l072z-lrwan1
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031 nucleo32-f042 nucleo32-l031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo32-f042 nucleo32-l031
BOARD_BLACKLIST := msb-430 msb-430h telosb wsn430-v1_3b wsn430-v1_4 z1
diff --git a/tests/pkg_u8g2/Makefile b/tests/pkg_u8g2/Makefile
index bde3ef7873d186554934bb4f99b82b0f8ea21834..9f50a0b7b34f7ad9018fd53069198ffcd3cbfef2 100644
--- a/tests/pkg_u8g2/Makefile
+++ b/tests/pkg_u8g2/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
USEMODULE += xtimer
diff --git a/tests/posix_semaphore/Makefile b/tests/posix_semaphore/Makefile
index a96c4a205162b5f65d6fca4d8ea614a3db3f20d1..4b9502430190e4ddc71f0710818c73099c446ad0 100644
--- a/tests/posix_semaphore/Makefile
+++ b/tests/posix_semaphore/Makefile
@@ -1,7 +1,7 @@
include ../Makefile.tests_common
BOARD_INSUFFICIENT_MEMORY := chronos mbed_lpc1768 msb-430 msb-430h nrf6310 \
- nucleo32-f031 nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
+ nucleo-f031k6 nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
nucleo-f334r8 nucleo-l053r8 spark-core \
stm32f0discovery yunjia-nrf51822
diff --git a/tests/ps_schedstatistics/Makefile b/tests/ps_schedstatistics/Makefile
index 514aa11d2382b204285c52bf8218e84eff2c875e..fae874a82076da0a2d3ac4a434bd33cec708bb17 100644
--- a/tests/ps_schedstatistics/Makefile
+++ b/tests/ps_schedstatistics/Makefile
@@ -1,7 +1,7 @@
include ../Makefile.tests_common
BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f030r8 nucleo-l053r8 \
- nucleo32-f031 nucleo32-f042 nucleo32-l031 \
+ nucleo-f031k6 nucleo32-f042 nucleo32-l031 \
stm32f0discovery telosb wsn430-v1_3b \
wsn430-v1_4 z1
diff --git a/tests/pthread_barrier/Makefile b/tests/pthread_barrier/Makefile
index 00fa00be45d40cefe6ba18653b32ceffb14378e4..c84d40056c953b51f7b8382fd896a69902b78b21 100644
--- a/tests/pthread_barrier/Makefile
+++ b/tests/pthread_barrier/Makefile
@@ -7,7 +7,7 @@ BOARD_BLACKLIST := arduino-mega2560 waspmote-pro arduino-uno arduino-duemilanove
# mega-xplained: unknown type name: clockid_t
# exclude boards with insufficient memory
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
# Modules to include.
USEMODULE += pthread
diff --git a/tests/pthread_condition_variable/Makefile b/tests/pthread_condition_variable/Makefile
index 28188ad1ae6d571ed6b6a09c068b15b393b2c3e4..e7580a79066b7d3c03c1ffc2b5b42de52768dd79 100644
--- a/tests/pthread_condition_variable/Makefile
+++ b/tests/pthread_condition_variable/Makefile
@@ -6,7 +6,7 @@ BOARD_BLACKLIST := arduino-mega2560 waspmote-pro arduino-uno arduino-duemilanove
# jiminy-mega256rfr2: unknown type name: clockid_t
# mega-xplained: unknown type name: clockid_t
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
USEMODULE += posix
USEMODULE += pthread
diff --git a/tests/pthread_cooperation/Makefile b/tests/pthread_cooperation/Makefile
index 0f67d96b7d83475199a8fd86b9080f3fe943c8cc..2c5b8cc33adbf21285b379e3dabc47b68a5855d8 100644
--- a/tests/pthread_cooperation/Makefile
+++ b/tests/pthread_cooperation/Makefile
@@ -6,7 +6,7 @@ BOARD_BLACKLIST := arduino-mega2560 waspmote-pro arduino-uno arduino-duemilanove
# jiminy-mega256rfr2: unknown type name: clockid_t
# mega-xplained: unknown type name: clockid_t
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
USEMODULE += posix
USEMODULE += pthread
diff --git a/tests/pthread_rwlock/Makefile b/tests/pthread_rwlock/Makefile
index 580f97a8edc43dff995b4fdd7f418202ac7fc639..751d41099ff450c1e0cced55a4d2af4171c949b1 100644
--- a/tests/pthread_rwlock/Makefile
+++ b/tests/pthread_rwlock/Makefile
@@ -10,7 +10,7 @@ USEMODULE += pthread
USEMODULE += xtimer
USEMODULE += random
-BOARD_INSUFFICIENT_MEMORY += chronos msb-430 msb-430h nucleo32-f031 \
+BOARD_INSUFFICIENT_MEMORY += chronos msb-430 msb-430h nucleo-f031k6 \
nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
nucleo-f334r8 nucleo-l053r8 stm32f0discovery
diff --git a/tests/rmutex/Makefile b/tests/rmutex/Makefile
index c7bad75488c4d18a8e8873fdb853abd51b18ed27..227ff2f7502893a6ed3442be4b9f82580e1d05d1 100644
--- a/tests/rmutex/Makefile
+++ b/tests/rmutex/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031 nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
nucleo-l053r8 stm32f0discovery
TEST_ON_CI_WHITELIST += all
diff --git a/tests/rng/Makefile b/tests/rng/Makefile
index 58b884feb6ff6c72880b9ddb84fc295adf21d82e..82f79a23afe92006b26f001977e7c4341967c8eb 100644
--- a/tests/rng/Makefile
+++ b/tests/rng/Makefile
@@ -1,7 +1,7 @@
include ../Makefile.tests_common
# some boards have not enough rom and/or ram
-BOARD_BLACKLIST += nucleo32-f031 nucleo32-f042 nucleo32-l031 pic32-clicker
+BOARD_BLACKLIST += nucleo-f031k6 nucleo32-f042 nucleo32-l031 pic32-clicker
BOARD_INSUFFICIENT_MEMORY += arduino-duemilanove arduino-uno
# override PRNG if desired (see sys/random for alternatives)
diff --git a/tests/sched_testing/Makefile b/tests/sched_testing/Makefile
index e69e3d5df93a0575099700b7cec73706cf6fbeb0..b72eab5acf438a296f84717290991f5f7e12b6dd 100644
--- a/tests/sched_testing/Makefile
+++ b/tests/sched_testing/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
TEST_ON_CI_WHITELIST += all
diff --git a/tests/slip/Makefile b/tests/slip/Makefile
index 6830deadc5c4e62fb6b2a40eecdf930b7da59ba3..a6ceb330e9f56cd7fd093d6e09b5e515ad24c9dc 100644
--- a/tests/slip/Makefile
+++ b/tests/slip/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := msb-430 msb-430h nucleo32-f031 nucleo32-f042 \
+BOARD_INSUFFICIENT_MEMORY := msb-430 msb-430h nucleo-f031k6 nucleo32-f042 \
nucleo32-l031 nucleo-f030r8 nucleo-f334r8 nucleo-l053r8 \
stm32f0discovery
diff --git a/tests/sntp/Makefile b/tests/sntp/Makefile
index 793010ae24e861395621fcd6936984b80f3fc8aa..797e42a3a5d0bc64cb57af18058774bf6b77d8f7 100644
--- a/tests/sntp/Makefile
+++ b/tests/sntp/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo32-f031 \
+BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f031k6 \
nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
nucleo-f334r8 nucleo-l053r8 stm32f0discovery \
telosb z1
diff --git a/tests/thread_basic/Makefile b/tests/thread_basic/Makefile
index 3657e8179e8c6b8085100eb7e4208b8d1022e4d9..7cd72a6bcff3c91d5922d8717d6523d9336b86d2 100644
--- a/tests/thread_basic/Makefile
+++ b/tests/thread_basic/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
DISABLE_MODULE += auto_init
diff --git a/tests/thread_cooperation/Makefile b/tests/thread_cooperation/Makefile
index d68726fe079fcde8421e5c59d15e731b986a59e7..d6b171acb71f04be87f0f417729690ccbd6863c9 100644
--- a/tests/thread_cooperation/Makefile
+++ b/tests/thread_cooperation/Makefile
@@ -3,7 +3,7 @@ include ../Makefile.tests_common
BOARD_INSUFFICIENT_MEMORY := chronos \
msb-430 \
msb-430h \
- nucleo32-f031
+ nucleo-f031k6
DISABLE_MODULE += auto_init
diff --git a/tests/thread_exit/Makefile b/tests/thread_exit/Makefile
index 4e31de8c5fcd051a38f3eee3fece361e5e2050c1..d83cec446f36fe0173806a481fad91caa3fe643f 100644
--- a/tests/thread_exit/Makefile
+++ b/tests/thread_exit/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
DISABLE_MODULE += auto_init
diff --git a/tests/thread_flags/Makefile b/tests/thread_flags/Makefile
index b7e4554ba080c399135a8c26c804cea0ac2f1117..3ce9af7db31f9a476bc9ac4cd3f0ae56852400ea 100644
--- a/tests/thread_flags/Makefile
+++ b/tests/thread_flags/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
USEMODULE += core_thread_flags
USEMODULE += xtimer
diff --git a/tests/thread_msg/Makefile b/tests/thread_msg/Makefile
index 7dbd24573804a7b4ad3b674d478b76b8ab7f8de9..393f39c25e46a6b7c1b6ce20de3f0fd011d1f589 100644
--- a/tests/thread_msg/Makefile
+++ b/tests/thread_msg/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031 nucleo32-f042
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo32-f042
DISABLE_MODULE += auto_init
diff --git a/tests/thread_msg_block_w_queue/Makefile b/tests/thread_msg_block_w_queue/Makefile
index 4e31de8c5fcd051a38f3eee3fece361e5e2050c1..d83cec446f36fe0173806a481fad91caa3fe643f 100644
--- a/tests/thread_msg_block_w_queue/Makefile
+++ b/tests/thread_msg_block_w_queue/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
DISABLE_MODULE += auto_init
diff --git a/tests/thread_msg_block_wo_queue/Makefile b/tests/thread_msg_block_wo_queue/Makefile
index 4e31de8c5fcd051a38f3eee3fece361e5e2050c1..d83cec446f36fe0173806a481fad91caa3fe643f 100644
--- a/tests/thread_msg_block_wo_queue/Makefile
+++ b/tests/thread_msg_block_wo_queue/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
DISABLE_MODULE += auto_init
diff --git a/tests/thread_msg_seq/Makefile b/tests/thread_msg_seq/Makefile
index c6a5a0e708156d22c6b4ea28d916fb14ff66d176..7c3195aeefd667f643072fb62272963da013cfe9 100644
--- a/tests/thread_msg_seq/Makefile
+++ b/tests/thread_msg_seq/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031 nucleo32-f042
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo32-f042
DISABLE_MODULE += auto_init
diff --git a/tests/thread_priority_inversion/Makefile b/tests/thread_priority_inversion/Makefile
index 86954358d2cdd8e2d50e619ef6c5bbeb5757e992..fb68091e216590ae4ba8dd54d8ea2549004c3ebb 100644
--- a/tests/thread_priority_inversion/Makefile
+++ b/tests/thread_priority_inversion/Makefile
@@ -2,6 +2,6 @@ include ../Makefile.tests_common
USEMODULE += xtimer
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
include $(RIOTBASE)/Makefile.include
diff --git a/tests/unittests/Makefile b/tests/unittests/Makefile
index bcf5778c263a445ed94516e40fd853faf2e43978..627b4bddda0bffc5ec3834e4d1c6b2bfe18ee313 100644
--- a/tests/unittests/Makefile
+++ b/tests/unittests/Makefile
@@ -28,7 +28,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon \
msba2 \
nrf51dongle \
nrf6310 \
- nucleo32-f031 \
+ nucleo-f031k6 \
nucleo32-f042 \
nucleo32-f303 \
nucleo32-l031 \
@@ -125,7 +125,7 @@ ARM_CORTEX_M_BOARDS := airfy-beacon \
nucleo-f722ze \
nucleo-f746zg \
nucleo-f767zi \
- nucleo32-f031 \
+ nucleo-f031k6 \
nucleo32-f042 \
nucleo32-f303 \
nucleo32-l031 \
diff --git a/tests/xtimer_drift/Makefile b/tests/xtimer_drift/Makefile
index 51a4d74af8471722c208fbf6ea5e43c0f72429ad..f3d19c2089ba064b7a66579e9e077ce67b296ad1 100644
--- a/tests/xtimer_drift/Makefile
+++ b/tests/xtimer_drift/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031 nucleo32-f042
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo32-f042
USEMODULE += xtimer
diff --git a/tests/xtimer_hang/Makefile b/tests/xtimer_hang/Makefile
index 7ae78d896d7a3e8a5043f91d68879e6323a27917..85437c51a283e6177ded4985cbc818c27b7f31af 100644
--- a/tests/xtimer_hang/Makefile
+++ b/tests/xtimer_hang/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
USEMODULE += xtimer
diff --git a/tests/xtimer_longterm/Makefile b/tests/xtimer_longterm/Makefile
index 51a4d74af8471722c208fbf6ea5e43c0f72429ad..f3d19c2089ba064b7a66579e9e077ce67b296ad1 100644
--- a/tests/xtimer_longterm/Makefile
+++ b/tests/xtimer_longterm/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031 nucleo32-f042
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo32-f042
USEMODULE += xtimer
diff --git a/tests/xtimer_msg/Makefile b/tests/xtimer_msg/Makefile
index 7ae78d896d7a3e8a5043f91d68879e6323a27917..85437c51a283e6177ded4985cbc818c27b7f31af 100644
--- a/tests/xtimer_msg/Makefile
+++ b/tests/xtimer_msg/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.tests_common
-BOARD_INSUFFICIENT_MEMORY := nucleo32-f031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
USEMODULE += xtimer