diff --git a/tests/mpu_stack_guard/Makefile b/tests/mpu_stack_guard/Makefile
index 1d3264167f04b5f5b358efd97f23153fd3a6dde7..2d0323ecface5424b7c498c1abbcc085cd8c7aab 100644
--- a/tests/mpu_stack_guard/Makefile
+++ b/tests/mpu_stack_guard/Makefile
@@ -11,7 +11,8 @@ BOARD_WHITELIST += f4vi1            # cortex-m4f
 BOARD_WHITELIST += fox              # cortex-m3
 BOARD_WHITELIST += frdm-k64f        # cortex-m4
 BOARD_WHITELIST += ikea-tradfri     # cortex-m4f
-BOARD_WHITELIST += iotlab-common    # cortex-m3
+BOARD_WHITELIST += iotlab-a8-m3     # cortex-m3
+BOARD_WHITELIST += iotlab-m3        # cortex-m3
 BOARD_WHITELIST += limifrog-v1      # cortex-m3
 BOARD_WHITELIST += maple-mini       # cortex-m3
 BOARD_WHITELIST += mbed_lpc1768     # cortex-m3
diff --git a/tests/netstats_l2/Makefile b/tests/netstats_l2/Makefile
index 2cfb6cf4a7a6052a1b4be209b7fffaada95c6f12..dd5adfca9c8bca6b7b429d54c1a272782fc45fc1 100644
--- a/tests/netstats_l2/Makefile
+++ b/tests/netstats_l2/Makefile
@@ -5,7 +5,7 @@ BOARD_PROVIDES_NETIF := airfy-beacon fox iotlab-m3 mulle native nrf51dongle \
 	nrf6310 pba-d-01-kw2x samd21-xpro saml21-xpro samr21-xpro spark-core \
 	yunjia-nrf51822
 
-BOARDS ?= $(shell find $(RIOTBASE)/boards/* -maxdepth 0 -type d \! -name "*-common" -exec basename {} \;)
+BOARDS ?= $(shell find $(RIOTBASE)/boards/* -maxdepth 0 -type d \! -name "common" -exec basename {} \;)
 
 BOARD_BLACKLIST := $(filter-out $(BOARD_PROVIDES_NETIF), $(BOARDS))
 
diff --git a/tests/unittests/Makefile b/tests/unittests/Makefile
index 3ee2bdcbed7aff2b91906bc3892cc684df3222be..1225ed95c1c9c600238f3190bbe0b995b97662fc 100644
--- a/tests/unittests/Makefile
+++ b/tests/unittests/Makefile
@@ -172,7 +172,6 @@ DISABLE_TEST_FOR_AVR := tests-relic tests-cpp_%
 
 MSP430_BOARDS := chronos \
                  msb-430 \
-                 msb-430-common \
                  msb-430h \
                  telosb \
                  wsn430-v1_3b \