diff --git a/boards/nucleo-f042/Makefile b/boards/nucleo32-f042/Makefile
similarity index 100%
rename from boards/nucleo-f042/Makefile
rename to boards/nucleo32-f042/Makefile
diff --git a/boards/nucleo-f042/Makefile.dep b/boards/nucleo32-f042/Makefile.dep
similarity index 100%
rename from boards/nucleo-f042/Makefile.dep
rename to boards/nucleo32-f042/Makefile.dep
diff --git a/boards/nucleo-f042/Makefile.features b/boards/nucleo32-f042/Makefile.features
similarity index 100%
rename from boards/nucleo-f042/Makefile.features
rename to boards/nucleo32-f042/Makefile.features
diff --git a/boards/nucleo-f042/Makefile.include b/boards/nucleo32-f042/Makefile.include
similarity index 100%
rename from boards/nucleo-f042/Makefile.include
rename to boards/nucleo32-f042/Makefile.include
diff --git a/boards/nucleo-f042/board.c b/boards/nucleo32-f042/board.c
similarity index 81%
rename from boards/nucleo-f042/board.c
rename to boards/nucleo32-f042/board.c
index 8ef551a05a46b423a06769dd494230115a52b829..a5befed462103600b8086c6a2b0f5df8ab09ae3f 100644
--- a/boards/nucleo-f042/board.c
+++ b/boards/nucleo32-f042/board.c
@@ -7,11 +7,11 @@
  */
 
 /**
- * @ingroup     boards_nucleo-f042
+ * @ingroup     boards_nucleo32-f042
  * @{
  *
  * @file
- * @brief       Board specific implementations for the nucleo-f042 board
+ * @brief       Board specific implementations for the nucleo32-f042 board
  *
  * @author      Vincent Dupont <vincent@otakeys.com>
  *
diff --git a/boards/nucleo-f042/dist/openocd.cfg b/boards/nucleo32-f042/dist/openocd.cfg
similarity index 100%
rename from boards/nucleo-f042/dist/openocd.cfg
rename to boards/nucleo32-f042/dist/openocd.cfg
diff --git a/boards/nucleo-f042/include/board.h b/boards/nucleo32-f042/include/board.h
similarity index 81%
rename from boards/nucleo-f042/include/board.h
rename to boards/nucleo32-f042/include/board.h
index 4826c48f9eb129572b5f58fc23eb0374aae73440..4dc207203e2938eb74e3b711e1cdca00c8cb0d75 100644
--- a/boards/nucleo-f042/include/board.h
+++ b/boards/nucleo32-f042/include/board.h
@@ -7,13 +7,13 @@
  */
 
 /**
- * @defgroup    boards_nucleo-f042 Nucleo-F042
+ * @defgroup    boards_nucleo32-f042 Nucleo-F042
  * @ingroup     boards
- * @brief       Board specific files for the nucleo-f042 board
+ * @brief       Board specific files for the nucleo32-f042 board
  * @{
  *
  * @file
- * @brief       Board specific definitions for the nucleo-f042 board
+ * @brief       Board specific definitions for the nucleo32-f042 board
  *
  * @author      Vincent Dupont <vincent@otakeys.com>
  */
diff --git a/boards/nucleo-f042/include/gpio_params.h b/boards/nucleo32-f042/include/gpio_params.h
similarity index 95%
rename from boards/nucleo-f042/include/gpio_params.h
rename to boards/nucleo32-f042/include/gpio_params.h
index 1fa15d0f7f4c4e3a03196418e139bc6e77714388..50e5e107cbd7df1407d767140cb46bae81a64412 100644
--- a/boards/nucleo-f042/include/gpio_params.h
+++ b/boards/nucleo32-f042/include/gpio_params.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup   boards_nucleo-f042
+ * @ingroup   boards_nucleo32-f042
  * @{
  *
  * @file
diff --git a/boards/nucleo-f042/include/periph_conf.h b/boards/nucleo32-f042/include/periph_conf.h
similarity index 95%
rename from boards/nucleo-f042/include/periph_conf.h
rename to boards/nucleo32-f042/include/periph_conf.h
index 48a5a537a7625ab54eeb9630721be6ca00fec754..b0bed0938e564128cafa17d8553b121cec487260 100644
--- a/boards/nucleo-f042/include/periph_conf.h
+++ b/boards/nucleo32-f042/include/periph_conf.h
@@ -7,11 +7,11 @@
  */
 
 /**
- * @ingroup     boards_nucleo-f042
+ * @ingroup     boards_nucleo32-f042
  * @{
  *
  * @file
- * @brief       Peripheral MCU configuration for the nucleo-f042 board
+ * @brief       Peripheral MCU configuration for the nucleo32-f042 board
  *
  * @author      Vincent Dupont <vincent@otakeys.com>
  */
diff --git a/examples/dtls-echo/Makefile b/examples/dtls-echo/Makefile
index d4e0b5b13e5240090c656db370152b3cc4c7372f..3a52c2aed2878313b83c12f65c92e656e05a2198 100644
--- a/examples/dtls-echo/Makefile
+++ b/examples/dtls-echo/Makefile
@@ -17,7 +17,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon nrf51dongle nrf6310 nucleo-f103 \
                              nucleo-f334 pca10000 pca10005 spark-core \
                              stm32f0discovery weio yunjia-nrf51822 nucleo-f072 \
                              cc2650stk nucleo-f030 nucleo-f070 microbit \
-                             calliope-mini nucleo-f042
+                             calliope-mini nucleo32-f042
 
 # Include packages that pull up and auto-init the link layer.
 # NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
diff --git a/examples/gcoap/Makefile b/examples/gcoap/Makefile
index ef76e1b8afaa76971e54e26b8dc0073d2e631d05..e59ed27b13dcef15bc1e9f9b55008ef0c33467dd 100644
--- a/examples/gcoap/Makefile
+++ b/examples/gcoap/Makefile
@@ -11,7 +11,7 @@ RIOTBASE ?= $(CURDIR)/../..
 
 BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f030 nucleo-f334 \
                              stm32f0discovery telosb weio wsn430-v1_3b wsn430-v1_4 \
-                             z1 nucleo-f042
+                             z1 nucleo32-f042
 
 # Must read nordic_softdevice_ble package before nanocoap package. However,
 # can't read it explicitly here because it is read later, as a dependency for
diff --git a/examples/gnrc_border_router/Makefile b/examples/gnrc_border_router/Makefile
index fe7d0439f8381deb40c6e9b85cc96cf94b715925..2a364cad22896fdccea26cba475d838154494a45 100644
--- a/examples/gnrc_border_router/Makefile
+++ b/examples/gnrc_border_router/Makefile
@@ -12,7 +12,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon cc2650stk msb-430 msb-430h pca10000 pc
                              spark-core stm32f0discovery telosb \
                              weio wsn430-v1_3b wsn430-v1_4 yunjia-nrf51822 z1 nucleo-f072 \
                              nucleo-f030 nucleo-f070 microbit calliope-mini \
-                             nucleo-f042
+                             nucleo32-f042
 
 # use ethos (ethernet over serial) for network communication and stdio over
 # UART, but not on native, as native has a tap interface towards the host.
diff --git a/examples/gnrc_networking/Makefile b/examples/gnrc_networking/Makefile
index fb8bfe88723ddb130059594be096f47b30c4e64d..af366b9cea308597095bce5398d5a26485079be4 100644
--- a/examples/gnrc_networking/Makefile
+++ b/examples/gnrc_networking/Makefile
@@ -11,7 +11,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon chronos msb-430 msb-430h nrf51dongle \
                           nrf6310 nucleo-f103 nucleo-f334 pca10000 pca10005 spark-core \
                           stm32f0discovery telosb weio wsn430-v1_3b wsn430-v1_4 \
                           yunjia-nrf51822 z1 nucleo-f072 nucleo-f030 nucleo-f070 \
-                          microbit calliope-mini nucleo-f042
+                          microbit calliope-mini nucleo32-f042
 
 # Include packages that pull up and auto-init the link layer.
 # NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
diff --git a/examples/gnrc_tftp/Makefile b/examples/gnrc_tftp/Makefile
index 9d27880eb12282b6e2fc67ac02a2d5c526017bc8..efdc245b1cfb98b92d008b5be896c3e5d69f174f 100644
--- a/examples/gnrc_tftp/Makefile
+++ b/examples/gnrc_tftp/Makefile
@@ -11,7 +11,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon chronos msb-430 msb-430h nrf51dongle \
                           nrf6310 nucleo-f103 nucleo-f334 pca10000 pca10005 \
                           spark-core stm32f0discovery telosb weio wsn430-v1_3b \
                           wsn430-v1_4 yunjia-nrf51822 z1 nucleo-f072 nucleo-f030 \
-                          nucleo-f070 microbit calliope-mini nucleo-f042
+                          nucleo-f070 microbit calliope-mini nucleo32-f042
 
 # Include packages that pull up and auto-init the link layer.
 # NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
diff --git a/examples/microcoap_server/Makefile b/examples/microcoap_server/Makefile
index 1b1758b2cdad65a75504b42c71d5f2bb95e1641e..512852a90c014c5e1fa668e98847a3531f049730 100644
--- a/examples/microcoap_server/Makefile
+++ b/examples/microcoap_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-f030 nucleo-f042 \
+BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f030 nucleo32-f042 \
                              pca10000 pca10005 stm32f0discovery telosb weio z1
 
 # Include packages that pull up and auto-init the link layer.
diff --git a/examples/nanocoap_server/Makefile b/examples/nanocoap_server/Makefile
index dd6884b192dce84105d0b465151c8672fad49588..c3ab6cbdd1a5c734d6c13db1e55fc5d482c5b506 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-f030 nucleo-f042 \
+BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f030 nucleo32-f042 \
                              stm32f0discovery telosb weio
 
 # blacklist this until #6022 is sorted out
diff --git a/examples/posix_sockets/Makefile b/examples/posix_sockets/Makefile
index 0b0f297ae2349d865723b154de14427b1aa13d11..acdf20d83dd54dcea520279b6abaaca70bba628f 100644
--- a/examples/posix_sockets/Makefile
+++ b/examples/posix_sockets/Makefile
@@ -10,7 +10,7 @@ RIOTBASE ?= $(CURDIR)/../..
 BOARD_INSUFFICIENT_MEMORY := airfy-beacon chronos msb-430 msb-430h nrf51dongle nrf6310 \
                              nucleo-f334 pca10000 pca10005 stm32f0discovery telosb weio \
                              wsn430-v1_3b wsn430-v1_4 yunjia-nrf51822 z1 nucleo-f072 \
-                             nucleo-f030 nucleo-f070 nucleo-f042
+                             nucleo-f030 nucleo-f070 nucleo32-f042
 
 # Include packages that pull up and auto-init the link layer.
 # NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
diff --git a/examples/riot_and_cpp/Makefile b/examples/riot_and_cpp/Makefile
index 091b4a03a92d84c49a6a9c3d337df02cae46cd38..ca2479792c53744106854bc45c34176f4f3e51ef 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=stm32f0discovery weio nucleo-f042
+BOARD_INSUFFICIENT_MEMORY=stm32f0discovery weio nucleo32-f042
 
 # This has to be the absolute path to the RIOT base directory:
 RIOTBASE ?= $(CURDIR)/../..
diff --git a/tests/coap/Makefile b/tests/coap/Makefile
index 631c932201222b4ad8a7a018d33f1ecb21cb173c..d3b07c85341c642bdacf9c95df850e4ebbfd1af3 100644
--- a/tests/coap/Makefile
+++ b/tests/coap/Makefile
@@ -6,7 +6,7 @@ BOARD_BLACKLIST := arduino-mega2560 chronos msb-430 msb-430h telosb wsn430-v1_3b
                    wsn430-v1_4 z1 waspmote-pro arduino-uno arduino-duemilanove
 BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f334 nucleo-f030 \
                              stm32f0discovery telosb weio wsn430-v1_3b wsn430-v1_4 z1 \
-                             nucleo-f070 nucleo-f042
+                             nucleo-f070 nucleo32-f042
 
 USEMODULE += gnrc_ipv6
 USEMODULE += gnrc_conn_udp
diff --git a/tests/conn_ip/Makefile b/tests/conn_ip/Makefile
index 919aada6be4b1ac7061cb28ee327ee014b3c0db5..30ee53231f038249a5bcb4c88c6bf588f45b3d88 100644
--- a/tests/conn_ip/Makefile
+++ b/tests/conn_ip/Makefile
@@ -6,7 +6,7 @@ RIOTBASE ?= $(CURDIR)/../..
 
 BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f334 stm32f0discovery telosb \
                              weio wsn430-v1_3b wsn430-v1_4 z1 nucleo-f030 nucleo-f070 \
-                             nucleo-f042
+                             nucleo32-f042
 
 USEMODULE += gnrc_netdev_default
 USEMODULE += auto_init_gnrc_netif
diff --git a/tests/driver_xbee/Makefile b/tests/driver_xbee/Makefile
index 1b6b75f143c9b18383bae1bea6299893219308d6..884636fc3bb419e6563c297dc5bef7e235d5470e 100644
--- a/tests/driver_xbee/Makefile
+++ b/tests/driver_xbee/Makefile
@@ -4,7 +4,7 @@ include ../Makefile.tests_common
 FEATURES_REQUIRED = periph_uart periph_gpio
 
 BOARD_INSUFFICIENT_MEMORY := nucleo-f030 nucleo-f334 stm32f0discovery weio \
-                             nucleo-f042
+                             nucleo32-f042
 
 USEMODULE += xbee
 USEMODULE += gnrc_netif
diff --git a/tests/gnrc_ipv6_ext/Makefile b/tests/gnrc_ipv6_ext/Makefile
index a1bbadadba367905a78d2d6a98cdb391e024680d..ded570d0fd0a0f9c96883b8eadeb55c95248f0ab 100644
--- a/tests/gnrc_ipv6_ext/Makefile
+++ b/tests/gnrc_ipv6_ext/Makefile
@@ -10,7 +10,7 @@ RIOTBASE ?= $(CURDIR)/../..
 BOARD_INSUFFICIENT_MEMORY := airfy-beacon chronos msb-430 msb-430h nrf51dongle \
                           nrf6310 nucleo-f103 nucleo-f334 pca10000 pca10005 spark-core \
                           stm32f0discovery telosb weio wsn430-v1_3b wsn430-v1_4 \
-                          yunjia-nrf51822 z1 nucleo-f030 nucleo-f042
+                          yunjia-nrf51822 z1 nucleo-f030 nucleo32-f042
 
 # Include packages that pull up and auto-init the link layer.
 # NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
diff --git a/tests/gnrc_sixlowpan/Makefile b/tests/gnrc_sixlowpan/Makefile
index 3f890044f281fc5504f1e6be79071c81059dd3f8..2996c313d8a54635c9278a790f82adb0124d82f5 100644
--- a/tests/gnrc_sixlowpan/Makefile
+++ b/tests/gnrc_sixlowpan/Makefile
@@ -10,7 +10,7 @@ RIOTBASE ?= $(CURDIR)/../..
 BOARD_INSUFFICIENT_MEMORY := airfy-beacon chronos msb-430 msb-430h nrf51dongle \
                           nrf6310 nucleo-f103 nucleo-f334 pca10000 pca10005 spark-core \
                           stm32f0discovery telosb weio wsn430-v1_3b wsn430-v1_4 \
-                          yunjia-nrf51822 z1 nucleo-f030 nucleo-f070 nucleo-f042
+                          yunjia-nrf51822 z1 nucleo-f030 nucleo-f070 nucleo32-f042
 
 # Include packages that pull up and auto-init the link layer.
 # NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
diff --git a/tests/gnrc_sock_udp/Makefile b/tests/gnrc_sock_udp/Makefile
index f38e3b783844774935e7e8a9cd9cbc0b2329b2f9..317782b8fc85f78502706c6e87ef4d09c1446dc7 100644
--- a/tests/gnrc_sock_udp/Makefile
+++ b/tests/gnrc_sock_udp/Makefile
@@ -4,7 +4,7 @@ BOARD ?= native
 
 RIOTBASE ?= $(CURDIR)/../..
 
-BOARD_INSUFFICIENT_MEMORY := nucleo-f042
+BOARD_INSUFFICIENT_MEMORY := nucleo32-f042
 
 USEMODULE += gnrc_sock_check_reuse
 USEMODULE += gnrc_sock_udp
diff --git a/tests/libfixmath_unittests/Makefile b/tests/libfixmath_unittests/Makefile
index b61872b4244265a6f7731af5fa43aec14a96d0fa..0d29b85dcf02613a3542b8046f6acf138d608f34 100644
--- a/tests/libfixmath_unittests/Makefile
+++ b/tests/libfixmath_unittests/Makefile
@@ -8,7 +8,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 := weio nucleo-f042
+BOARD_INSUFFICIENT_MEMORY := weio nucleo32-f042
 
 USEMODULE += libfixmath-unittests
 
diff --git a/tests/lwip_sock_ip/Makefile b/tests/lwip_sock_ip/Makefile
index d34d1e3835485991f8fe0ab5910f28d1cffd6cf1..369b49d039b2bb5ca0e6c5fa57972c2bc59211fb 100644
--- a/tests/lwip_sock_ip/Makefile
+++ b/tests/lwip_sock_ip/Makefile
@@ -7,7 +7,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
-BOARD_INSUFFICIENT_MEMORY = nucleo-f030 nucleo-f042 nucleo-f334 \
+BOARD_INSUFFICIENT_MEMORY = nucleo-f030 nucleo32-f042 nucleo-f334 \
                             stm32f0discovery weio
 
 LWIP_IPV4 ?= 0
diff --git a/tests/mutex_order/Makefile b/tests/mutex_order/Makefile
index a402d031963880daeb793c87c230fa6da99ab0e0..92534214539e2ae8d52c1debf36c12cc18fea733 100644
--- a/tests/mutex_order/Makefile
+++ b/tests/mutex_order/Makefile
@@ -1,6 +1,6 @@
 APPLICATION = mutex_order
 include ../Makefile.tests_common
 
-BOARD_INSUFFICIENT_MEMORY := stm32f0discovery weio nucleo-f030 nucleo-f042
+BOARD_INSUFFICIENT_MEMORY := stm32f0discovery weio nucleo-f030 nucleo32-f042
 
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/nhdp/Makefile b/tests/nhdp/Makefile
index 6f741483e7379bce22d681a1e029eee764c62e3f..2783bf2eb29f4ba1f39e8205bb1ac59cbac4d71b 100644
--- a/tests/nhdp/Makefile
+++ b/tests/nhdp/Makefile
@@ -5,7 +5,7 @@ BOARD_BLACKLIST := arduino-mega2560 chronos msb-430 msb-430h telosb \
                    wsn430-v1_3b wsn430-v1_4 z1 waspmote-pro arduino-uno \
                    arduino-duemilanove
 BOARD_INSUFFICIENT_MEMORY := nucleo-f334 stm32f0discovery weio nucleo-f030 \
-                             nucleo-f042
+                             nucleo32-f042
 
 USEMODULE += gnrc_ipv6
 USEMODULE += gnrc_conn_udp
diff --git a/tests/posix_semaphore/Makefile b/tests/posix_semaphore/Makefile
index 54ab8fa9f141f01287cf76557f58a9135a0934c8..bad3e977951c6bfb359b4731ab93e0d6309e6938 100644
--- a/tests/posix_semaphore/Makefile
+++ b/tests/posix_semaphore/Makefile
@@ -3,7 +3,7 @@ include ../Makefile.tests_common
 
 BOARD_INSUFFICIENT_MEMORY := msb-430 msb-430h mbed_lpc1768 chronos stm32f0discovery \
                           pca10000 pca10005 weio yunjia-nrf51822 nrf6310 spark-core \
-                          nucleo-f334 nucleo-f030 nucleo-f042
+                          nucleo-f334 nucleo-f030 nucleo32-f042
 
 USEMODULE += fmt
 USEMODULE += posix_semaphore
diff --git a/tests/pthread_rwlock/Makefile b/tests/pthread_rwlock/Makefile
index a00c909502419d02ecc1f9e4fee06b82769bd533..2ade95ce510a84d6efa7fbbcaf0bd386d7c85064 100644
--- a/tests/pthread_rwlock/Makefile
+++ b/tests/pthread_rwlock/Makefile
@@ -13,6 +13,6 @@ CFLAGS += -DNATIVE_AUTO_EXIT
 BOARD_INSUFFICIENT_MEMORY += chronos mbed_lpc1768 msb-430 msb-430h stm32f0discovery \
                           pca10000 pca10005 yunjia-nrf51822 spark-core nucleo-f334 \
                           airfy-beacon nrf51dongle nrf6310 weio nucleo-f030 \
-                          nucleo-f042
+                          nucleo32-f042
 
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/slip/Makefile b/tests/slip/Makefile
index 4852a70cd4b38aadcb57ca7d8caae8f28591f1ff..3b02cb7c70025dde104ef5edaadfe4163a086545 100644
--- a/tests/slip/Makefile
+++ b/tests/slip/Makefile
@@ -2,7 +2,7 @@ APPLICATION = driver_slip
 include ../Makefile.tests_common
 
 BOARD_INSUFFICIENT_MEMORY := msb-430 msb-430h nucleo-f334 stm32f0discovery weio \
-                          nucleo-f030 nucleo-f042
+                          nucleo-f030 nucleo32-f042
 
 USEMODULE += auto_init_gnrc_netif
 USEMODULE += gnrc
diff --git a/tests/thread_cooperation/Makefile b/tests/thread_cooperation/Makefile
index e52f393cf2dbb88a22cf7d4010d1fbe1960a3440..7831d7eb501f5b9fcae4ec6321f027b5dc0abed9 100644
--- a/tests/thread_cooperation/Makefile
+++ b/tests/thread_cooperation/Makefile
@@ -6,7 +6,7 @@ BOARD_INSUFFICIENT_MEMORY := cc2650stk chronos msb-430 msb-430h mbed_lpc1768 \
                           yunjia-nrf51822 spark-core airfy-beacon nucleo-f103 \
                           nucleo-f334 nrf51dongle nrf6310 weio nucleo-f072 \
                           nucleo-f030 nucleo-f070 microbit calliope-mini \
-                          nucleo-f042
+                          nucleo32-f042
 
 DISABLE_MODULE += auto_init
 
diff --git a/tests/thread_msg/Makefile b/tests/thread_msg/Makefile
index 1290ddc73e56673eaf065db24d16251e52ea33ad..22612f9285c75421f70ad742110710c3efc7273d 100644
--- a/tests/thread_msg/Makefile
+++ b/tests/thread_msg/Makefile
@@ -1,7 +1,7 @@
 APPLICATION = thread_msg
 include ../Makefile.tests_common
 
-BOARD_INSUFFICIENT_MEMORY := stm32f0discovery nucleo-f042
+BOARD_INSUFFICIENT_MEMORY := stm32f0discovery nucleo32-f042
 
 DISABLE_MODULE += auto_init
 
diff --git a/tests/thread_msg_seq/Makefile b/tests/thread_msg_seq/Makefile
index 0b4114e2d19fc898285daf5c43713349071cbeae..9e5687e0b60b50388dca40e663190a7d4f378850 100644
--- a/tests/thread_msg_seq/Makefile
+++ b/tests/thread_msg_seq/Makefile
@@ -1,7 +1,7 @@
 APPLICATION = thread_msg_seq
 include ../Makefile.tests_common
 
-BOARD_INSUFFICIENT_MEMORY := stm32f0discovery nucleo-f042
+BOARD_INSUFFICIENT_MEMORY := stm32f0discovery nucleo32-f042
 
 DISABLE_MODULE += auto_init
 
diff --git a/tests/unittests/Makefile b/tests/unittests/Makefile
index fdb10e27cd92343a817c35201d06a67e4e2ee759..9a65c75cd0a90871f0686b61fc488d6719cdbc00 100644
--- a/tests/unittests/Makefile
+++ b/tests/unittests/Makefile
@@ -12,7 +12,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon cc2650stk chronos ek-lm4f120xl \
                           nucleo-f030 nucleo-f070 nucleo-f091 pba-d-01-kw2x \
                           saml21-xpro microbit calliope-mini limifrog-v1 \
                           slwstk6220a ek-lm4f120xl stm32f3discovery \
-                          slwstk6220a nucleo-f042
+                          slwstk6220a nucleo32-f042
 
 USEMODULE += embunit
 
diff --git a/tests/xtimer_drift/Makefile b/tests/xtimer_drift/Makefile
index 397428b02dd4ee4dd86a05de39938da203ad34f9..6bca560d4ddaff2703b155252baa43c5d01c4b0a 100644
--- a/tests/xtimer_drift/Makefile
+++ b/tests/xtimer_drift/Makefile
@@ -1,7 +1,7 @@
 APPLICATION = xtimer_drift
 include ../Makefile.tests_common
 
-BOARD_INSUFFICIENT_MEMORY := nucleo-f042
+BOARD_INSUFFICIENT_MEMORY := nucleo32-f042
 
 USEMODULE += xtimer
 
diff --git a/tests/xtimer_longterm/Makefile b/tests/xtimer_longterm/Makefile
index 4ea956ce4af25759a4664209df57382ddfd70a46..33e55d1eda0cc948e0bf4a08282d0c34a1652d1d 100644
--- a/tests/xtimer_longterm/Makefile
+++ b/tests/xtimer_longterm/Makefile
@@ -1,7 +1,7 @@
 APPLICATION = xtimer_longterm
 include ../Makefile.tests_common
 
-BOARD_INSUFFICIENT_MEMORY := nucleo-f042
+BOARD_INSUFFICIENT_MEMORY := nucleo32-f042
 
 USEMODULE += xtimer