diff --git a/boards/nucleo32-f042/Makefile b/boards/nucleo-f042k6/Makefile
similarity index 100%
rename from boards/nucleo32-f042/Makefile
rename to boards/nucleo-f042k6/Makefile
diff --git a/boards/nucleo32-f042/Makefile.dep b/boards/nucleo-f042k6/Makefile.dep
similarity index 100%
rename from boards/nucleo32-f042/Makefile.dep
rename to boards/nucleo-f042k6/Makefile.dep
diff --git a/boards/nucleo32-f042/Makefile.features b/boards/nucleo-f042k6/Makefile.features
similarity index 100%
rename from boards/nucleo32-f042/Makefile.features
rename to boards/nucleo-f042k6/Makefile.features
diff --git a/boards/nucleo32-f042/Makefile.include b/boards/nucleo-f042k6/Makefile.include
similarity index 100%
rename from boards/nucleo32-f042/Makefile.include
rename to boards/nucleo-f042k6/Makefile.include
diff --git a/boards/nucleo32-f042/include/periph_conf.h b/boards/nucleo-f042k6/include/periph_conf.h
similarity index 96%
rename from boards/nucleo32-f042/include/periph_conf.h
rename to boards/nucleo-f042k6/include/periph_conf.h
index 1d3f592102cc34aebbf5ebb0d2f7da3db9c0eef6..98c04c461857cf6f93b0084fd8bea1c229dee947 100644
--- a/boards/nucleo32-f042/include/periph_conf.h
+++ b/boards/nucleo-f042k6/include/periph_conf.h
@@ -7,13 +7,13 @@
  */
 
 /**
- * @defgroup    boards_nucleo32-f042 STM32 Nucleo32-F042
+ * @defgroup    boards_nucleo-f042k6 STM32 Nucleo-F042K6
  * @ingroup     boards_common_nucleo32
- * @brief       Support for the STM32 Nucleo32-F042
+ * @brief       Support for the STM32 Nucleo-F042K6
  * @{
  *
  * @file
- * @brief       Peripheral MCU configuration for the nucleo32-f042 board
+ * @brief       Peripheral MCU configuration for the nucleo-f042k6 board
  *
  * @author      Vincent Dupont <vincent@otakeys.com>
  */
diff --git a/examples/dtls-echo/Makefile b/examples/dtls-echo/Makefile
index 95b8d027ef1f8bf21842027670c0756d1e5de494..1f48537f7997b327cdb7c89a5f33dae37dd0b0fe 100644
--- a/examples/dtls-echo/Makefile
+++ b/examples/dtls-echo/Makefile
@@ -15,7 +15,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 nucleo-f031k6 \
-                             nucleo32-f042 nucleo32-f303 nucleo32-l031 nucleo-f030r8 \
+                             nucleo-f042k6 nucleo32-f303 nucleo32-l031 nucleo-f030r8 \
                              nucleo-f070rb nucleo-f072rb nucleo-f103rb nucleo-f302r8 nucleo-f334r8 \
                              nucleo-l053r8 nucleo-l073rz opencm904 \
                              spark-core stm32f0discovery yunjia-nrf51822
diff --git a/examples/emcute_mqttsn/Makefile b/examples/emcute_mqttsn/Makefile
index 8b8dc906d9ed7da384772f7ecde98730fa1082f9..71f58d4d41ed25bd955fa8412a99d5aabdde8038 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 nucleo-f031k6 nucleo32-f042 \
+                             chronos msb-430 msb-430h nucleo-f031k6 nucleo-f042k6 \
                              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/gcoap/Makefile b/examples/gcoap/Makefile
index d9b76b9400009edee577e45abb618721a14abdcd..386cafe7f872fa5d1162baf7daf400c346b23383 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 nucleo-f031k6 nucleo32-f042 \
+BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f031k6 nucleo-f042k6 \
                              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 5a258af68735d67fc67ead2e94c2a36f6cf19ac0..907ccaee2c41433f6136842865851e875106657a 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 \
-                             nucleo-f031k6 nucleo32-f042 nucleo32-f303 nucleo32-l031 \
+                             nucleo-f031k6 nucleo-f042k6 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_networking/Makefile b/examples/gnrc_networking/Makefile
index bc2e61adea363a5fc91da1891e2fed52a5d5518f..371271d69b11a498018536183b9a2d3f629183f5 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 \
-                             nucleo-f031k6 nucleo32-f042 nucleo32-f303 nucleo32-l031 \
+                             nucleo-f031k6 nucleo-f042k6 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 e13ef2b094ed3983a72323408178decbf3b2fac0..dfa480bf50c86546a56da4481aff499dfaedf1e2 100644
--- a/examples/gnrc_tftp/Makefile
+++ b/examples/gnrc_tftp/Makefile
@@ -9,7 +9,7 @@ RIOTBASE ?= $(CURDIR)/../..
 
 BOARD_INSUFFICIENT_MEMORY := airfy-beacon b-l072z-lrwan1 bluepill calliope-mini chronos \
                              microbit msb-430 msb-430h nrf51dongle nrf6310 nucleo-f031k6 \
-                             nucleo32-f042 nucleo32-f303 nucleo32-l031 nucleo-f030r8 \
+                             nucleo-f042k6 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 yunjia-nrf51822 z1
diff --git a/examples/javascript/Makefile b/examples/javascript/Makefile
index 827dc0c63eb27c3b299fc777dc47e9961b8005ad..82614d726d5ee09234a10f4e22ca777715c4a3a8 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 nucleo-f031k6 nucleo32-f042 \
+                             nucleo-l053r8 nucleo-l073rz nucleo-f031k6 nucleo-f042k6 \
                              nucleo32-f303 nucleo32-l031 opencm904 \
                              spark-core stm32f0discovery yunjia-nrf51822 \
 
diff --git a/examples/nanocoap_server/Makefile b/examples/nanocoap_server/Makefile
index 5289a3f226b53a7e7247030d9de24adde11a5dfb..a6f70f872de8aa657696965b6aab6537c3974244 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 nucleo-f031k6 nucleo32-f042 \
+BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f031k6 nucleo-f042k6 \
                              nucleo32-l031 nucleo-f030r8 nucleo-l053r8 stm32f0discovery \
                              telosb z1
 
diff --git a/examples/posix_sockets/Makefile b/examples/posix_sockets/Makefile
index d627b1ae978cf3ca0909b9d1f6b53b745aa971c4..283d43111f52c62a8385db6d3674f21709a22abb 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 nucleo-f031k6 nucleo32-f042 nucleo32-l031 \
+                             nrf6310 nucleo-f031k6 nucleo-f042k6 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 1074f763aca8b6764ca9722a986d9cf8d572094d..4de865ec9ee03e1e753f604c9bc182d2cb3136b4 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 \
-                             nucleo-f031k6 nucleo32-f042 nucleo32-l031 \
+                             nucleo-f031k6 nucleo-f042k6 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 e0493d85fbf5748b1c6d472045311e6528822dbf..094a7dbe7d374a446d4e0b0f9e9d0de716273ad2 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= nucleo-f031k6 nucleo32-f042 stm32f0discovery
+BOARD_INSUFFICIENT_MEMORY= nucleo-f031k6 nucleo-f042k6 stm32f0discovery
 
 # This has to be the absolute path to the RIOT base directory:
 RIOTBASE ?= $(CURDIR)/../..
diff --git a/tests/conn_can/Makefile b/tests/conn_can/Makefile
index 1ebd271418de24670bab0e04f280031cd38fcf1f..8a2dc1ce100f2a3dede8fe0da9b60f16a6580cc1 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 nucleo-f031k6 nucleo32-f042 \
+BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f031k6 nucleo-f042k6 \
                              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_enc28j60/Makefile b/tests/driver_enc28j60/Makefile
index 8f79496addbd0db68effa30ccead5a5eee2f27bd..647bb9a413bb528a149d844db141b9ca77dc1697 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 \
-                             nucleo-f031k6 nucleo32-f042 nucleo32-l031 \
+                             nucleo-f031k6 nucleo-f042k6 nucleo32-l031 \
                              stm32f0discovery telosb wsn430-v1_3b wsn430-v1_4 \
                              z1
 
diff --git a/tests/driver_encx24j600/Makefile b/tests/driver_encx24j600/Makefile
index e9cebf8012cdb67b41b8a53fa4c2a7999bc95722..0ac45ba3645d542ea01ae55d61badb98bc10bb2f 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 nucleo-f031k6 nucleo32-f042 \
+                             nucleo-l053r8 nucleo-f031k6 nucleo-f042k6 \
                              nucleo32-l031 stm32f0discovery telosb \
                              wsn430-v1_3b wsn430-v1_4 z1
 
diff --git a/tests/driver_kw2xrf/Makefile b/tests/driver_kw2xrf/Makefile
index fd9218b81ce6b2ec161366b9ff9760756de843fd..5f8100b8609fb4ba77afeadb5a86309498fe2d1b 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 := nucleo-f031k6 nucleo32-f042 nucleo32-l031 \
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo-f042k6 nucleo32-l031 \
                              nucleo-f334r8 nucleo-l053r8 stm32f0discovery
 
 USEMODULE += auto_init_gnrc_netif
diff --git a/tests/driver_xbee/Makefile b/tests/driver_xbee/Makefile
index 6202b65f165342a025cfecbf202007f280abc64c..e6938d1928157d6ee38d1cd3aad3142d147bcf84 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 := nucleo-f031k6 nucleo32-f042 nucleo-f030r8 nucleo-f334r8 \
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo-f042k6 nucleo-f030r8 nucleo-f334r8 \
                              stm32f0discovery
 
 USEMODULE += xbee
diff --git a/tests/emb6/Makefile b/tests/emb6/Makefile
index 61147ae9b4e5518a68d57ede4b4d1fb7fd58acec..460b0100e462ca9c79cefb2e39dbce94a5b0b44d 100644
--- a/tests/emb6/Makefile
+++ b/tests/emb6/Makefile
@@ -6,7 +6,7 @@ include ../Makefile.tests_common
 BOARD_BLACKLIST := msb-430 msb-430h telosb wsn430-v1_3b wsn430-v1_4 z1
 
 BOARD_INSUFFICIENT_MEMORY := msb-430 msb-430h nucleo32-l031 nucleo-f031k6 \
-                             nucleo32-f042 nucleo-l053r8 stm32f0discovery telosb \
+                             nucleo-f042k6 nucleo-l053r8 stm32f0discovery telosb \
                              wsn430-v1_3b wsn430-v1_4 z1
 
 USEPKG += emb6
diff --git a/tests/evtimer_msg/Makefile b/tests/evtimer_msg/Makefile
index dcd65f6d54ad707557ea4e86699fc25dfa69659b..d1b3167f5909eb8edad54a8ac610387a3006e846 100644
--- a/tests/evtimer_msg/Makefile
+++ b/tests/evtimer_msg/Makefile
@@ -1,6 +1,6 @@
 include ../Makefile.tests_common
 
-BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo32-f042
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo-f042k6
 
 USEMODULE += evtimer
 
diff --git a/tests/evtimer_underflow/Makefile b/tests/evtimer_underflow/Makefile
index dcd65f6d54ad707557ea4e86699fc25dfa69659b..d1b3167f5909eb8edad54a8ac610387a3006e846 100644
--- a/tests/evtimer_underflow/Makefile
+++ b/tests/evtimer_underflow/Makefile
@@ -1,6 +1,6 @@
 include ../Makefile.tests_common
 
-BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo32-f042
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo-f042k6
 
 USEMODULE += evtimer
 
diff --git a/tests/gnrc_ipv6_ext/Makefile b/tests/gnrc_ipv6_ext/Makefile
index 61d0f60d1f85e7a0936d23728ebdeac3c9676ac2..b0dd910f26803f27dd3307010ecef9e19f52099b 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 nucleo-f031k6 nucleo32-f042 \
+                             nrf51dongle nrf6310 nucleo-f031k6 nucleo-f042k6 \
                              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 071a0246de2b23912f9b85401422f7d6b99c783e..a70dd9a0593910ab8ef62d90a925b598508eef88 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 nucleo-f031k6 nucleo32-f042 nucleo32-l031 \
+BOARD_INSUFFICIENT_MEMORY := chronos nucleo-f031k6 nucleo-f042k6 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 793f390bbc549b870511695f9ee0424ee8bcd20b..a88ad9e6d6e84e9c3ea6c9edcc48804718d2cae7 100644
--- a/tests/gnrc_ipv6_nib_6ln/Makefile
+++ b/tests/gnrc_ipv6_nib_6ln/Makefile
@@ -1,7 +1,7 @@
 include ../Makefile.tests_common
 
 BOARD_INSUFFICIENT_MEMORY := chronos nucleo-f030r8 nucleo-l053r8 nucleo-f031k6 \
-                             nucleo32-l031 nucleo32-f042 stm32f0discovery \
+                             nucleo32-l031 nucleo-f042k6 stm32f0discovery \
                              telosb wsn430-v1_3b wsn430-v1_4
 
 USEMODULE += gnrc_ipv6
diff --git a/tests/gnrc_ndp/Makefile b/tests/gnrc_ndp/Makefile
index 697fe6c4463ca25bf6195d57e0d66987fd991a82..c852fc07d4c141136603373c31d6039c19c9476f 100644
--- a/tests/gnrc_ndp/Makefile
+++ b/tests/gnrc_ndp/Makefile
@@ -1,6 +1,6 @@
 include ../Makefile.tests_common
 
-BOARD_INSUFFICIENT_MEMORY := chronos nucleo-f031k6 nucleo32-f042 nucleo32-l031 \
+BOARD_INSUFFICIENT_MEMORY := chronos nucleo-f031k6 nucleo-f042k6 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 4d37aee249b01ed591431378943db876299bc38d..04b0570f185fa2785ebcb2ae95991774480204b1 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 \
-                             nucleo-f031k6 nucleo32-f042 nucleo32-f303 \
+                             nucleo-f031k6 nucleo-f042k6 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 5a48b201c6cf5540cdd3ba640590e2f654d17a68..60bfd301bd718600b88528c57ab32c75ac35164f 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 nucleo-f031k6 nucleo32-f042 \
+                             nrf51dongle nrf6310 nucleo-f031k6 nucleo-f042k6 \
                              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 b2966525502bedde290ae69b04c1af14c27ebe4d..bf532382e8848fada00904d480d7a86e34643c72 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 nucleo-f031k6 \
+BOARD_INSUFFICIENT_MEMORY := chronos telosb nucleo-f042k6 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 7cc27d56ab66e1641fcc9a9e01e6c070abf842bc..c3d91c9fa3586748731c7d6a889dcb4b1107da38 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 nucleo-f031k6 nucleo32-f042 nucleo32-l031
+BOARD_INSUFFICIENT_MEMORY := chronos nucleo-f031k6 nucleo-f042k6 nucleo32-l031
 
 USEMODULE += gnrc_sock_ip
 USEMODULE += gnrc_ipv6
diff --git a/tests/gnrc_sock_udp/Makefile b/tests/gnrc_sock_udp/Makefile
index 51e196178bbc9d303ac7c9378ec77707ce596ba0..b88ad33d94e17f6f5c4cbda64e10916ce945dc78 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 nucleo-f031k6 nucleo32-f042 nucleo32-l031
+BOARD_INSUFFICIENT_MEMORY := chronos nucleo-f031k6 nucleo-f042k6 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 88e11a4098c897eab4acc2b82e2b2e8194146176..1ea2806095f7915be0566f028d85bf24ca0a68d2 100644
--- a/tests/gnrc_tcp_client/Makefile
+++ b/tests/gnrc_tcp_client/Makefile
@@ -12,7 +12,7 @@ TCP_TEST_CYCLES ?= 3
 BOARD_INSUFFICIENT_MEMORY := airfy-beacon arduino-duemilanove arduino-mega2560 \
                              arduino-uno calliope-mini chronos mega-xplained microbit \
                              msb-430 msb-430h nrf51dongle nrf6310 nucleo-f031k6 \
-                             nucleo32-f042 nucleo32-f303 nucleo32-l031 nucleo-f030r8 \
+                             nucleo-f042k6 nucleo32-f303 nucleo32-l031 nucleo-f030r8 \
                              nucleo-f070rb nucleo-f072rb nucleo-f302r8 nucleo-f334r8 nucleo-l053r8 \
                              sb-430 sb-430h stm32f0discovery telosb \
                              wsn430-v1_3b wsn430-v1_4 yunjia-nrf51822 z1
diff --git a/tests/gnrc_tcp_server/Makefile b/tests/gnrc_tcp_server/Makefile
index bef29c710e60071c41310ea1fe94cbdce57a0caa..87e3b25f6672274c58a78d41dc83b0e4be9b58be 100644
--- a/tests/gnrc_tcp_server/Makefile
+++ b/tests/gnrc_tcp_server/Makefile
@@ -12,7 +12,7 @@ TCP_TEST_CYCLES ?= 3
 BOARD_INSUFFICIENT_MEMORY := airfy-beacon arduino-duemilanove arduino-mega2560 \
                              arduino-uno calliope-mini chronos mega-xplained \
                              microbit msb-430 msb-430h nrf51dongle nrf6310 nucleo-f031k6 \
-                             nucleo32-f042 nucleo32-f303 nucleo32-l031 nucleo-f030r8 \
+                             nucleo-f042k6 nucleo32-f303 nucleo32-l031 nucleo-f030r8 \
                              nucleo-f070rb nucleo-f072rb nucleo-f302r8 nucleo-f334r8 nucleo-l053r8 \
                              sb-430 sb-430h stm32f0discovery telosb \
                              wsn430-v1_3b wsn430-v1_4 yunjia-nrf51822 z1
diff --git a/tests/gnrc_udp/Makefile b/tests/gnrc_udp/Makefile
index 9c51e89bb5280b09ebce4306774032e3ad3b68e0..ecd656e7a1cbb8bc43a947e97fa04fb2064070d6 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 \
-                             nucleo-f031k6 nucleo32-f042 nucleo32-f303 nucleo32-l031 \
+                             nucleo-f031k6 nucleo-f042k6 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/libfixmath_unittests/Makefile b/tests/libfixmath_unittests/Makefile
index b3233338e3ba2b1bc7b1f2f986bb529f5884c2ca..7f0a273f83d82a17b20502839f793f7ae4fb2f42 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 := nucleo-f031k6 nucleo32-f042 nucleo32-l031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo-f042k6 nucleo32-l031
 
 USEMODULE += libfixmath-unittests
 
diff --git a/tests/lwip/Makefile b/tests/lwip/Makefile
index 4bba5a4bdcfae8b19fb054beece79f6f5e449d0f..5d82fa3eca64b9e767b1cfc69bbbd691ff8184a2 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 nucleo-f031k6 nucleo32-f042 \
+BOARD_INSUFFICIENT_MEMORY := airfy-beacon nrf6310 nucleo-f031k6 nucleo-f042k6 \
                              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 e1ca2f2616890e5c6c6b8d8ca6f2e4e263c10c48..d52987dd92b53e0e8b4385fc533100771c600812 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 = nucleo-f031k6 nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
+BOARD_INSUFFICIENT_MEMORY = nucleo-f031k6 nucleo-f042k6 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 41aabd181c0adbdf96a68cc6967520e0c35d6939..6c8663f9c2ce7fb4fb8894684be6fa9728dea017 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 = nucleo-f031k6 nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
+BOARD_INSUFFICIENT_MEMORY = nucleo-f031k6 nucleo-f042k6 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 a3b66225ed50d04513e927b32d98022e98108520..1786f35fb27a3f88dc82b2dc0c5f7f861b34a336 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 = nucleo-f031k6 nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
+BOARD_INSUFFICIENT_MEMORY = nucleo-f031k6 nucleo-f042k6 nucleo32-l031 nucleo-f030r8 \
                             nucleo-f334r8 nucleo-l053r8 stm32f0discovery
 
 LWIP_IPV4 ?= 0
diff --git a/tests/mutex_order/Makefile b/tests/mutex_order/Makefile
index 3467a84375a2481ebb233dde32406436a955070a..c63f1d01ef2cde11d9d3841b7529a315db5667bf 100644
--- a/tests/mutex_order/Makefile
+++ b/tests/mutex_order/Makefile
@@ -1,6 +1,6 @@
 include ../Makefile.tests_common
 
-BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo-f042k6 nucleo32-l031 nucleo-f030r8 \
                              nucleo-l053r8 stm32f0discovery
 
 # list of boards to run CI tests on
diff --git a/tests/nhdp/Makefile b/tests/nhdp/Makefile
index b1e07fc61993da0e36bd0332a63ef94eee6e0526..fb8e9593cf1c841d17f5c0cbe84c75931122027c 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 := nucleo-f031k6 nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo-f042k6 nucleo32-l031 nucleo-f030r8 \
                              nucleo-f334r8 nucleo-l053r8 stm32f0discovery
 
 USEMODULE += gnrc_ipv6
diff --git a/tests/pkg_fatfs/Makefile b/tests/pkg_fatfs/Makefile
index 95f66be8a44425853a17502c92d0f5c8eb79b101..cf0b265f4805254991ab476a54655b8925f99ab7 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 \
-                   nucleo-f031k6 nucleo32-f042 nucleo32-f303 nucleo32-l031 \
+                   nucleo-f031k6 nucleo-f042k6 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 6d9a851632b32037864d3f5214ce14a78aed3d90..39e5687d705c75ed470c042dcbca7542d93a8012 100644
--- a/tests/pkg_fatfs_vfs/Makefile
+++ b/tests/pkg_fatfs_vfs/Makefile
@@ -35,7 +35,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-f042 nucleo32-f303 nucleo32-l031 \
+                   nucleo-f042k6 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_libcoap/Makefile b/tests/pkg_libcoap/Makefile
index 773726a0abcbe7a7f5660c500e9c9412607b4710..26aab7974ad8e8c74d7c20021f9abea2314a402f 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 nucleo-f031k6 nucleo32-f042 \
+BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f031k6 nucleo-f042k6 \
                              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 28cfd6665d1ebd61c60c64ca9bb02e02e6abe8c2..8f393366740122d32519e58d7e1a2b5e25bfdcf6 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 nucleo-f031k6 nucleo32-f042 \
+BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f031k6 nucleo-f042k6 \
                              nucleo32-l031 nucleo-f030r8 nucleo-l053r8 \
                              stm32f0discovery telosb z1
 
diff --git a/tests/pkg_semtech-loramac/Makefile b/tests/pkg_semtech-loramac/Makefile
index 187ca183fe330c94eb44ec65456487cf4c27609d..4846e8457d024ee7900165e90c226f73b9baf747 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 := nucleo-f031k6 nucleo32-f042 nucleo32-l031
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo-f042k6 nucleo32-l031
 
 BOARD_BLACKLIST := msb-430 msb-430h telosb wsn430-v1_3b wsn430-v1_4 z1
 
diff --git a/tests/posix_semaphore/Makefile b/tests/posix_semaphore/Makefile
index 4b9502430190e4ddc71f0710818c73099c446ad0..260f94aac71efd90dda96666fd5d9b3dde142839 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 \
-                             nucleo-f031k6 nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
+                             nucleo-f031k6 nucleo-f042k6 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 fae874a82076da0a2d3ac4a434bd33cec708bb17..59491b4701f1f915dd84a65ddbae62429771db71 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 \
-                             nucleo-f031k6 nucleo32-f042 nucleo32-l031 \
+                             nucleo-f031k6 nucleo-f042k6 nucleo32-l031 \
                              stm32f0discovery telosb wsn430-v1_3b \
                              wsn430-v1_4 z1
 
diff --git a/tests/pthread_rwlock/Makefile b/tests/pthread_rwlock/Makefile
index 751d41099ff450c1e0cced55a4d2af4171c949b1..a48287bf5ed139df1b4ee08fd11b2f70f3fd6155 100644
--- a/tests/pthread_rwlock/Makefile
+++ b/tests/pthread_rwlock/Makefile
@@ -11,7 +11,7 @@ USEMODULE += xtimer
 USEMODULE += random
 
 BOARD_INSUFFICIENT_MEMORY += chronos msb-430 msb-430h nucleo-f031k6 \
-                             nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
+                             nucleo-f042k6 nucleo32-l031 nucleo-f030r8 \
                              nucleo-f334r8 nucleo-l053r8 stm32f0discovery
 
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/rmutex/Makefile b/tests/rmutex/Makefile
index 227ff2f7502893a6ed3442be4b9f82580e1d05d1..a7b4826095ae9065f0c9127337e34cdcbecfce45 100644
--- a/tests/rmutex/Makefile
+++ b/tests/rmutex/Makefile
@@ -1,6 +1,6 @@
 include ../Makefile.tests_common
 
-BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo-f042k6 nucleo32-l031 nucleo-f030r8 \
                              nucleo-l053r8 stm32f0discovery
 
 TEST_ON_CI_WHITELIST += all
diff --git a/tests/rng/Makefile b/tests/rng/Makefile
index 82f79a23afe92006b26f001977e7c4341967c8eb..37c2fff2894ec497c784ba6586870aebd888b72f 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 += nucleo-f031k6 nucleo32-f042 nucleo32-l031 pic32-clicker
+BOARD_BLACKLIST += nucleo-f031k6 nucleo-f042k6 nucleo32-l031 pic32-clicker
 BOARD_INSUFFICIENT_MEMORY += arduino-duemilanove arduino-uno
 
 # override PRNG if desired (see sys/random for alternatives)
diff --git a/tests/slip/Makefile b/tests/slip/Makefile
index a6ceb330e9f56cd7fd093d6e09b5e515ad24c9dc..b62769a5df025b315daf47c3f4260ac08bf75b8c 100644
--- a/tests/slip/Makefile
+++ b/tests/slip/Makefile
@@ -1,6 +1,6 @@
 include ../Makefile.tests_common
 
-BOARD_INSUFFICIENT_MEMORY := msb-430 msb-430h nucleo-f031k6 nucleo32-f042 \
+BOARD_INSUFFICIENT_MEMORY := msb-430 msb-430h nucleo-f031k6 nucleo-f042k6 \
                              nucleo32-l031 nucleo-f030r8 nucleo-f334r8 nucleo-l053r8 \
                              stm32f0discovery
 
diff --git a/tests/sntp/Makefile b/tests/sntp/Makefile
index 797e42a3a5d0bc64cb57af18058774bf6b77d8f7..df00d6ee5c397b07c60785b6cd5194807ce3ef70 100644
--- a/tests/sntp/Makefile
+++ b/tests/sntp/Makefile
@@ -1,7 +1,7 @@
 include ../Makefile.tests_common
 
 BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f031k6 \
-                             nucleo32-f042 nucleo32-l031 nucleo-f030r8 \
+                             nucleo-f042k6 nucleo32-l031 nucleo-f030r8 \
                              nucleo-f334r8 nucleo-l053r8 stm32f0discovery \
                              telosb z1
 
diff --git a/tests/thread_cooperation/Makefile b/tests/thread_cooperation/Makefile
index d6b171acb71f04be87f0f417729690ccbd6863c9..391a60c143352de6fff038385abdad0cfa63ad47 100644
--- a/tests/thread_cooperation/Makefile
+++ b/tests/thread_cooperation/Makefile
@@ -7,7 +7,7 @@ BOARD_INSUFFICIENT_MEMORY :=    chronos \
 
 DISABLE_MODULE += auto_init
 
-ifneq (,$(filter nucleo32-f042,$(BOARD)))
+ifneq (,$(filter nucleo-f042k6,$(BOARD)))
   PROBLEM ?= 3
 endif
 ifneq (,$(filter nucleo-f030r8 nucleo32-l031 nucleo-l053r8 stm32f0discovery,$(BOARD)))
diff --git a/tests/thread_msg/Makefile b/tests/thread_msg/Makefile
index 393f39c25e46a6b7c1b6ce20de3f0fd011d1f589..de021461e54c2e899d63fc6a533df34b3e121d13 100644
--- a/tests/thread_msg/Makefile
+++ b/tests/thread_msg/Makefile
@@ -1,6 +1,6 @@
 include ../Makefile.tests_common
 
-BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo32-f042
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo-f042k6
 
 DISABLE_MODULE += auto_init
 
diff --git a/tests/thread_msg_seq/Makefile b/tests/thread_msg_seq/Makefile
index 7c3195aeefd667f643072fb62272963da013cfe9..6b90efb53824aafb8bd55b3099a3248b945fd7f9 100644
--- a/tests/thread_msg_seq/Makefile
+++ b/tests/thread_msg_seq/Makefile
@@ -1,6 +1,6 @@
 include ../Makefile.tests_common
 
-BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo32-f042
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo-f042k6
 
 DISABLE_MODULE += auto_init
 
diff --git a/tests/unittests/Makefile b/tests/unittests/Makefile
index 627b4bddda0bffc5ec3834e4d1c6b2bfe18ee313..d794208fdb110286075900ac234f525ac304945f 100644
--- a/tests/unittests/Makefile
+++ b/tests/unittests/Makefile
@@ -29,7 +29,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon \
                              nrf51dongle \
                              nrf6310 \
                              nucleo-f031k6 \
-                             nucleo32-f042 \
+                             nucleo-f042k6 \
                              nucleo32-f303 \
                              nucleo32-l031 \
                              nucleo32-l432 \
@@ -126,7 +126,7 @@ ARM_CORTEX_M_BOARDS := airfy-beacon \
                        nucleo-f746zg \
                        nucleo-f767zi \
                        nucleo-f031k6 \
-                       nucleo32-f042 \
+                       nucleo-f042k6 \
                        nucleo32-f303 \
                        nucleo32-l031 \
                        nucleo32-l432 \
diff --git a/tests/xtimer_drift/Makefile b/tests/xtimer_drift/Makefile
index f3d19c2089ba064b7a66579e9e077ce67b296ad1..0a59269b7140ac30b7f83a77510fb3ce9266dd93 100644
--- a/tests/xtimer_drift/Makefile
+++ b/tests/xtimer_drift/Makefile
@@ -1,6 +1,6 @@
 include ../Makefile.tests_common
 
-BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo32-f042
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo-f042k6
 
 USEMODULE += xtimer
 
diff --git a/tests/xtimer_longterm/Makefile b/tests/xtimer_longterm/Makefile
index f3d19c2089ba064b7a66579e9e077ce67b296ad1..0a59269b7140ac30b7f83a77510fb3ce9266dd93 100644
--- a/tests/xtimer_longterm/Makefile
+++ b/tests/xtimer_longterm/Makefile
@@ -1,6 +1,6 @@
 include ../Makefile.tests_common
 
-BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo32-f042
+BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6 nucleo-f042k6
 
 USEMODULE += xtimer