diff --git a/.strider.yml b/.strider.yml
index 5b2cb5fb755621abc7b8f498f1c0d6139a9f0ebf..efee235ec0555c3ccfc2dd0a7a76bd2c9f0f1369 100644
--- a/.strider.yml
+++ b/.strider.yml
@@ -9,7 +9,8 @@ env:
     - NPROC_MAX=8 BUILDTEST_MCU_GROUP=static-tests
     - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m4_2
     - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m4_1
-    - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m0
+    - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m0_2
+    - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m0_1
     - NPROC_MAX=8 BUILDTEST_MCU_GROUP=x86
     - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m3_2
     - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m3_1
diff --git a/.travis.yml b/.travis.yml
index fc7c92b2ed231ddf4f8d53db87e6dccaa842cf8b..6f6c8e290d2058625c3132f521cb8ebec4e1d6fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,8 @@ env:
     - NPROC_MAX=8 BUILDTEST_MCU_GROUP=static-tests
     - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m4_2
     - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m4_1
-    - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m0
+    - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m0_2
+    - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m0_1
     - NPROC_MAX=8 BUILDTEST_MCU_GROUP=x86
     - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m3_2
     - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m3_1
diff --git a/boards/airfy-beacon/Makefile.features b/boards/airfy-beacon/Makefile.features
index 89a8a9bf13385826d1c27230289e5dec2e963dff..badcfdd52d83e06f22fab98842f6150efb2c469a 100644
--- a/boards/airfy-beacon/Makefile.features
+++ b/boards/airfy-beacon/Makefile.features
@@ -13,4 +13,4 @@ FEATURES_PROVIDED += cpp
 FEATURES_PROVIDED += radio_nrfmin
 
 # The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m0
+FEATURES_MCU_GROUP = cortex_m0_2
diff --git a/boards/nrf51dongle/Makefile.features b/boards/nrf51dongle/Makefile.features
index 65262bfc08ff15846cc593843641ab832b6d76e0..7a113953754827dca96eb37eac269c66454d214c 100644
--- a/boards/nrf51dongle/Makefile.features
+++ b/boards/nrf51dongle/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += cpp
 FEATURES_PROVIDED += radio_nrfmin
 
 # The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m0
+FEATURES_MCU_GROUP = cortex_m0_1
diff --git a/boards/nrf6310/Makefile.features b/boards/nrf6310/Makefile.features
index 5e5c632d7ef101bf10a5d9dbde74096e01a33d8f..654dd547c2f01293058c6c7c392485c0ca46c03b 100644
--- a/boards/nrf6310/Makefile.features
+++ b/boards/nrf6310/Makefile.features
@@ -12,4 +12,4 @@ FEATURES_PROVIDED += cpp
 FEATURES_PROVIDED += radio_nrfmin
 
 # The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m0
+FEATURES_MCU_GROUP = cortex_m0_2
diff --git a/boards/nucleo-f091/Makefile.features b/boards/nucleo-f091/Makefile.features
index c8bd5caade9bc14f1afdad5976a63e1d7d57f488..c7f508057a7c1f44403127bd31afa73ad0f5de6b 100644
--- a/boards/nucleo-f091/Makefile.features
+++ b/boards/nucleo-f091/Makefile.features
@@ -9,4 +9,4 @@ FEATURES_PROVIDED += periph_uart
 FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m0
+FEATURES_MCU_GROUP = cortex_m0_1
diff --git a/boards/pca10000/Makefile.features b/boards/pca10000/Makefile.features
index 65262bfc08ff15846cc593843641ab832b6d76e0..679b12a7c97a0ab61baf4f7c501a712893d15cf0 100644
--- a/boards/pca10000/Makefile.features
+++ b/boards/pca10000/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += cpp
 FEATURES_PROVIDED += radio_nrfmin
 
 # The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m0
+FEATURES_MCU_GROUP = cortex_m0_2
diff --git a/boards/pca10005/Makefile.features b/boards/pca10005/Makefile.features
index 89a8a9bf13385826d1c27230289e5dec2e963dff..15d011d6174c523619fc0ea44b1f95d2fa503200 100644
--- a/boards/pca10005/Makefile.features
+++ b/boards/pca10005/Makefile.features
@@ -13,4 +13,4 @@ FEATURES_PROVIDED += cpp
 FEATURES_PROVIDED += radio_nrfmin
 
 # The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m0
+FEATURES_MCU_GROUP = cortex_m0_1
diff --git a/boards/saml21-xpro/Makefile.features b/boards/saml21-xpro/Makefile.features
index 013e25cb9d4fde6805212d60b7ef4bcaa6e43a4b..3592748fac5f4d6d4bde16080920cfb2ccccdd06 100644
--- a/boards/saml21-xpro/Makefile.features
+++ b/boards/saml21-xpro/Makefile.features
@@ -9,4 +9,4 @@ FEATURES_PROVIDED += periph_uart
 FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m0
+FEATURES_MCU_GROUP = cortex_m0_2
diff --git a/boards/samr21-xpro/Makefile.features b/boards/samr21-xpro/Makefile.features
index 6c981cf570809eb43eeb708ad756d92155aefabc..3b09ac148df781fba007195ff800287d3a2b06f0 100644
--- a/boards/samr21-xpro/Makefile.features
+++ b/boards/samr21-xpro/Makefile.features
@@ -13,4 +13,4 @@ FEATURES_PROVIDED += periph_uart
 FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m0
+FEATURES_MCU_GROUP = cortex_m0_2
diff --git a/boards/stm32f0discovery/Makefile.features b/boards/stm32f0discovery/Makefile.features
index 24bf3142e1ca8deaff3bdabb73b1cdb4f6efa98d..c5fce98a77f9ed9399084cabf16e7fb6690a27cb 100644
--- a/boards/stm32f0discovery/Makefile.features
+++ b/boards/stm32f0discovery/Makefile.features
@@ -10,4 +10,4 @@ FEATURES_PROVIDED += periph_uart
 FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m0
+FEATURES_MCU_GROUP = cortex_m0_1
diff --git a/boards/weio/Makefile.features b/boards/weio/Makefile.features
index 469294c05b092b0db36857c2182ea84e878e9115..30c35d42e8a73cd75787207b9d1f72f42bdd7bd0 100644
--- a/boards/weio/Makefile.features
+++ b/boards/weio/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += periph_uart
 FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m0
+FEATURES_MCU_GROUP = cortex_m0_1
diff --git a/boards/yunjia-nrf51822/Makefile.features b/boards/yunjia-nrf51822/Makefile.features
index efb3091a433571584afb9b4b3293e28d354377f2..558d62e846a259f717621d3805a8350c0be2c191 100644
--- a/boards/yunjia-nrf51822/Makefile.features
+++ b/boards/yunjia-nrf51822/Makefile.features
@@ -13,4 +13,4 @@ FEATURES_PROVIDED += radio_nrfmin
 FEATURES_PROVIDED += cpp
 
 # The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m0
+FEATURES_MCU_GROUP = cortex_m0_2
diff --git a/dist/tools/drone-scripts/build_and_test.sh b/dist/tools/drone-scripts/build_and_test.sh
index 99e455a95ac5e553828c32c10d9cfee984020912..7086a025e14c733313f2354b8e01800adb3486e0 100755
--- a/dist/tools/drone-scripts/build_and_test.sh
+++ b/dist/tools/drone-scripts/build_and_test.sh
@@ -65,7 +65,8 @@ if $FULL_CHECK; then
     # Execute all groups in parallel (-k ensures correct ordering of the
     # output)
     parallel -k exec_build_func {} "$@"  ::: static-tests avr8 msp430 x86 arm7 \
-                                             cortex_m0 cortex_m3_1 cortex_m3_2 \
+                                             cortex_m0_2 cortex_m0_1 \
+                                             cortex_m3_1 cortex_m3_2 \
                                              cortex_m4_1 cortex_m4_2 \
     |& tee -a "$MYTMPDIR/output.log"
 else
diff --git a/dist/tools/travis-scripts/get-pkg-list.py b/dist/tools/travis-scripts/get-pkg-list.py
index 777af8de88c36f65848ae05af073155e4808b07b..ecae99d44dce8343378b5d77fbdbbeff744f783b 100755
--- a/dist/tools/travis-scripts/get-pkg-list.py
+++ b/dist/tools/travis-scripts/get-pkg-list.py
@@ -20,8 +20,8 @@
 
 import os
 
-arm_mcu_groups = ["arm7", "cortex_m0", "cortex_m3_1", "cortex_m3_2",
-                  "cortex_m4_1", "cortex_m4_2"]
+arm_mcu_groups = ["arm7", "cortex_m0_2", "cortex_m0_1", "cortex_m3_1",
+                  "cortex_m3_2", "cortex_m4_1", "cortex_m4_2"]
 msp_mcu_groups = ["msp430"]
 x86_mcu_groups = ["x86"]
 avr8_mcu_groups = ["avr8"]