diff --git a/tests/gnrc_sock_dns/Makefile b/tests/gnrc_sock_dns/Makefile
index 35a153065c13106acdd7b31eec5f552bc7a142b3..8b65f7cc9b0882c799ac338f4632173d2a97cdd4 100644
--- a/tests/gnrc_sock_dns/Makefile
+++ b/tests/gnrc_sock_dns/Makefile
@@ -20,7 +20,7 @@ CFLAGS += -DDEVELHELP
 LOW_MEMORY_BOARDS := nucleo-f334 msb-430 msb-430h
 
 ifeq ($(BOARD),$(filter $(BOARD),$(LOW_MEMORY_BOARDS)))
-    CFLAGS += -DGNRC_PKTBUF_SIZE=512 -DGNRC_IPV6_NETIF_ADDR_NUMOF=4 -DGNRC_IPV6_NC_SIZE=1
+  CFLAGS += -DGNRC_PKTBUF_SIZE=512 -DGNRC_IPV6_NETIF_ADDR_NUMOF=4 -DGNRC_IPV6_NC_SIZE=1
 endif
 
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/unittests/Makefile b/tests/unittests/Makefile
index 4deb9cdae5291efdcfeece8e32d676f63816ecf0..53f0ea3e2983af394485613e6f1b28558faa00d8 100644
--- a/tests/unittests/Makefile
+++ b/tests/unittests/Makefile
@@ -64,11 +64,11 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon \
 USEMODULE += embunit
 
 ifeq (, $(filter tests-%, $(MAKECMDGOALS)))
-    # the $(dir) Makefile function leaves a trailing slash after the directory
-    # name, therefore we use patsubst instead.
-    UNIT_TESTS := $(patsubst %/Makefile,%,$(wildcard tests-*/Makefile))
+  # the $(dir) Makefile function leaves a trailing slash after the directory
+  # name, therefore we use patsubst instead.
+  UNIT_TESTS := $(patsubst %/Makefile,%,$(wildcard tests-*/Makefile))
 else
-    UNIT_TESTS := $(filter tests-%, $(MAKECMDGOALS))
+  UNIT_TESTS := $(filter tests-%, $(MAKECMDGOALS))
 endif
 
 ARM7_BOARDS := msba2 avrextrem
@@ -143,25 +143,25 @@ MSP430_BOARDS :=  chronos msb-430 msb-430h telosb wsn430-v1_3b wsn430-v1_4 z1
 DISABLE_TEST_FOR_MSP430 := tests-relic tests-spiffs tests-cpp_%
 
 ifneq (, $(filter $(ARM7_BOARDS), $(BOARD)))
-UNIT_TESTS := $(filter-out $(DISABLE_TEST_FOR_ARM7), $(UNIT_TESTS))
+  UNIT_TESTS := $(filter-out $(DISABLE_TEST_FOR_ARM7), $(UNIT_TESTS))
 endif
 
 ifneq (, $(filter $(ARM_CORTEX_M_BOARDS), $(BOARD)))
-UNIT_TESTS := $(filter-out $(DISABLE_TEST_FOR_ARM_CORTEX_M), $(UNIT_TESTS))
+  UNIT_TESTS := $(filter-out $(DISABLE_TEST_FOR_ARM_CORTEX_M), $(UNIT_TESTS))
 endif
 
 ifneq (, $(filter $(AVR_BOARDS), $(BOARD)))
-UNIT_TESTS := $(filter-out $(DISABLE_TEST_FOR_AVR), $(UNIT_TESTS))
+  UNIT_TESTS := $(filter-out $(DISABLE_TEST_FOR_AVR), $(UNIT_TESTS))
 endif
 
 ifneq (, $(filter $(MSP430_BOARDS), $(BOARD)))
-UNIT_TESTS := $(filter-out $(DISABLE_TEST_FOR_MSP430), $(UNIT_TESTS))
+  UNIT_TESTS := $(filter-out $(DISABLE_TEST_FOR_MSP430), $(UNIT_TESTS))
 endif
 
 ifneq (,$(filter tests-cpp_%, $(UNIT_TESTS)))
-    # We need to tell the build system to use the C++ compiler for linking
-    export FEATURES_REQUIRED += cpp
-    export CPPMIX := 1
+  # We need to tell the build system to use the C++ compiler for linking
+  export FEATURES_REQUIRED += cpp
+  export CPPMIX := 1
 endif
 
 DISABLE_MODULE += auto_init
@@ -185,10 +185,10 @@ $(UNIT_TESTS): all
 charCOMMA := ,
 
 ifeq (, $(UNIT_TESTS))
-    CFLAGS += -DNO_TEST_SUITES
-    $(warning There was no test suite specified!)
+  CFLAGS += -DNO_TEST_SUITES
+  $(warning There was no test suite specified!)
 else
-    CFLAGS += -DTEST_SUITES='$(subst $() $(),$(charCOMMA),$(UNIT_TESTS:tests-%=%))'
+  CFLAGS += -DTEST_SUITES='$(subst $() $(),$(charCOMMA),$(UNIT_TESTS:tests-%=%))'
 endif
 
 test: