diff --git a/tests/driver_kw2xrf/kw2xrf_params.h b/tests/driver_kw2xrf/kw2xrf_params.h
index f763375546946cb04bc198a9e4a661abd60d116e..6d97054de5ca23c47117fa6f6839f26c7f1cb79f 100644
--- a/tests/driver_kw2xrf/kw2xrf_params.h
+++ b/tests/driver_kw2xrf/kw2xrf_params.h
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup     tests_kw2xrf
+ * @ingroup     tests
  * @brief       generic kw2xrf pin config
  *
  * Copyright (C) 2014 PHYTEC Messtechnik GmbH
diff --git a/tests/fault_handler/main.c b/tests/fault_handler/main.c
index d5618475655efe0939912593ec8c26f24976befb..5a2a52fb3187f6bf77b234d9b736a4fa7635008f 100644
--- a/tests/fault_handler/main.c
+++ b/tests/fault_handler/main.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     test
+ * @ingroup     tests
  * @{
  *
  * @file
diff --git a/tests/gnrc_sock_ip/constants.h b/tests/gnrc_sock_ip/constants.h
index 0f7082954022655cbcaeb9768d098b2e81a6ff32..0f26b7cecced23873b86bb976ad44a3c4103c5c8 100644
--- a/tests/gnrc_sock_ip/constants.h
+++ b/tests/gnrc_sock_ip/constants.h
@@ -7,8 +7,7 @@
  */
 
 /**
- * @defgroup
- * @ingroup
+ * @ingroup     tests
  * @brief
  * @{
  *
@@ -16,6 +15,7 @@
  * @brief
  *
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
+ * @}
  */
 #ifndef CONSTANTS_H
 #define CONSTANTS_H
@@ -40,4 +40,3 @@ extern "C" {
 #endif
 
 #endif /* CONSTANTS_H */
-/** @} */
diff --git a/tests/gnrc_sock_ip/main.c b/tests/gnrc_sock_ip/main.c
index 29d3b49f472208c14811aac172124bbca4b09306..cf3591e7ef137e62d204c2dd94d526cae4c0a659 100644
--- a/tests/gnrc_sock_ip/main.c
+++ b/tests/gnrc_sock_ip/main.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     examples
+ * @ingroup     tests
  * @{
  *
  * @file
diff --git a/tests/gnrc_sock_ip/stack.h b/tests/gnrc_sock_ip/stack.h
index f5ab509da90dc84f10634ccdc45647d06c119e44..88b9849d03c7b145f15fe78ff74be1707e6bd6ae 100644
--- a/tests/gnrc_sock_ip/stack.h
+++ b/tests/gnrc_sock_ip/stack.h
@@ -7,8 +7,7 @@
  */
 
 /**
- * @defgroup
- * @ingroup
+ * @ingroup     tests
  * @brief
  * @{
  *
@@ -16,6 +15,7 @@
  * @brief
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
+ * @}
  */
 #ifndef STACK_H
 #define STACK_H
@@ -87,4 +87,3 @@ bool _check_packet(const ipv6_addr_t *src, const ipv6_addr_t *dst,
 #endif
 
 #endif /* STACK_H */
-/** @} */
diff --git a/tests/gnrc_sock_udp/constants.h b/tests/gnrc_sock_udp/constants.h
index 9e9c2fa3d0c3ff860fcea4902b501c9c3ec65b22..87fba4c4a9795906993833b5a0295b4afcc18024 100644
--- a/tests/gnrc_sock_udp/constants.h
+++ b/tests/gnrc_sock_udp/constants.h
@@ -7,8 +7,7 @@
  */
 
 /**
- * @defgroup
- * @ingroup
+ * @ingroup     tests
  * @brief
  * @{
  *
@@ -16,6 +15,7 @@
  * @brief
  *
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
+ * @}
  */
 #ifndef CONSTANTS_H
 #define CONSTANTS_H
@@ -41,4 +41,3 @@ extern "C" {
 #endif
 
 #endif /* CONSTANTS_H */
-/** @} */
diff --git a/tests/gnrc_sock_udp/stack.c b/tests/gnrc_sock_udp/stack.c
index 00134a37332ebd58ae43cfbd7bc45be01123a48d..177fb30132860ff5a4b3172bf1b2adad60483ed5 100644
--- a/tests/gnrc_sock_udp/stack.c
+++ b/tests/gnrc_sock_udp/stack.c
@@ -7,10 +7,12 @@
  */
 
 /**
+ * @ingroup     tests
  * @{
  *
  * @file
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
+ * @}
  */
 
 
@@ -167,6 +169,3 @@ bool _check_packet(const ipv6_addr_t *src, const ipv6_addr_t *dst,
                 (data_len == udp->next->size) &&
                 (memcmp(data, udp->next->data, data_len) == 0));
 }
-
-
-/** @} */
diff --git a/tests/gnrc_sock_udp/stack.h b/tests/gnrc_sock_udp/stack.h
index 8f83392f79c3ee3bb6063af9a8040adc318210c7..d38f314103ac9e6e0b8c77dc19594665b13c9b1a 100644
--- a/tests/gnrc_sock_udp/stack.h
+++ b/tests/gnrc_sock_udp/stack.h
@@ -7,8 +7,7 @@
  */
 
 /**
- * @defgroup
- * @ingroup
+ * @ingroup     tests
  * @brief
  * @{
  *
@@ -16,6 +15,7 @@
  * @brief
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
+ * @}
  */
 #ifndef STACK_H
 #define STACK_H
@@ -92,4 +92,3 @@ bool _check_packet(const ipv6_addr_t *src, const ipv6_addr_t *dst,
 #endif
 
 #endif /* STACK_H */
-/** @} */
diff --git a/tests/lwip_sock_ip/constants.h b/tests/lwip_sock_ip/constants.h
index 4ddf6271499555e4adbc33c3266bb134c43c017f..b6a6565414faac71cfcd8fd197b5546dc15d819b 100644
--- a/tests/lwip_sock_ip/constants.h
+++ b/tests/lwip_sock_ip/constants.h
@@ -7,8 +7,7 @@
  */
 
 /**
- * @defgroup
- * @ingroup
+ * @ingroup     tests
  * @brief
  * @{
  *
@@ -16,6 +15,7 @@
  * @brief
  *
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
+ * @}
  */
 #ifndef CONSTANTS_H
 #define CONSTANTS_H
@@ -45,4 +45,3 @@ extern "C" {
 #endif
 
 #endif /* CONSTANTS_H */
-/** @} */
diff --git a/tests/lwip_sock_ip/main.c b/tests/lwip_sock_ip/main.c
index 3b64aed5570c919710d37152f82b2dd61944a072..c0e95dc9bb3e8ab46946774d1dc64a43c2aa64db 100644
--- a/tests/lwip_sock_ip/main.c
+++ b/tests/lwip_sock_ip/main.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     examples
+ * @ingroup     tests
  * @{
  *
  * @file
diff --git a/tests/lwip_sock_ip/stack.c b/tests/lwip_sock_ip/stack.c
index 23ee9cabf99ac891c059f85de1ae4fb9b3568eed..7f49aecdc1ce5740e9fa6ea85eabdd339cb9b771 100644
--- a/tests/lwip_sock_ip/stack.c
+++ b/tests/lwip_sock_ip/stack.c
@@ -7,10 +7,12 @@
  */
 
 /**
+ * @ingroup     tests
  * @{
  *
  * @file
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
+ * @}
  */
 
 
@@ -369,5 +371,3 @@ bool _check_6packet(const ipv6_addr_t *src, const ipv6_addr_t *dst,
     return false;
 #endif
 }
-
-/** @} */
diff --git a/tests/lwip_sock_ip/stack.h b/tests/lwip_sock_ip/stack.h
index bdbac98ebb498f70a02700594c11c32b8a913372..0985026f741cb430dd63bbcf742360dff7b1c45d 100644
--- a/tests/lwip_sock_ip/stack.h
+++ b/tests/lwip_sock_ip/stack.h
@@ -7,8 +7,7 @@
  */
 
 /**
- * @defgroup
- * @ingroup
+ * @ingroup     tests
  * @brief
  * @{
  *
@@ -16,6 +15,7 @@
  * @brief
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
+ * @}
  */
 #ifndef STACK_H
 #define STACK_H
@@ -120,4 +120,3 @@ bool _check_6packet(const ipv6_addr_t *src, const ipv6_addr_t *dst,
 #endif
 
 #endif /* STACK_H */
-/** @} */
diff --git a/tests/lwip_sock_tcp/constants.h b/tests/lwip_sock_tcp/constants.h
index d6637689c03e692da7facb7860c5fda6175122e0..1b99b16950fe0f04db4f34ac5b67c3907994cd1c 100644
--- a/tests/lwip_sock_tcp/constants.h
+++ b/tests/lwip_sock_tcp/constants.h
@@ -7,8 +7,7 @@
  */
 
 /**
- * @defgroup
- * @ingroup
+ * @ingroup     tests
  * @brief
  * @{
  *
@@ -16,6 +15,7 @@
  * @brief
  *
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
+ * @}
  */
 #ifndef CONSTANTS_H
 #define CONSTANTS_H
@@ -46,4 +46,3 @@ extern "C" {
 #endif
 
 #endif /* CONSTANTS_H */
-/** @} */
diff --git a/tests/lwip_sock_tcp/stack.c b/tests/lwip_sock_tcp/stack.c
index 879f751b21f5d776e6aa73a1fb2d89ea845a307f..d736f7e5f8529cd9f3a632f57f305881ff3fb5c1 100644
--- a/tests/lwip_sock_tcp/stack.c
+++ b/tests/lwip_sock_tcp/stack.c
@@ -11,6 +11,7 @@
  *
  * @file
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
+ * @}
  */
 
 
@@ -26,5 +27,3 @@ void _net_init(void)
     xtimer_init();
     lwip_bootstrap();
 }
-
-/** @} */
diff --git a/tests/lwip_sock_tcp/stack.h b/tests/lwip_sock_tcp/stack.h
index c3fccf8e22435ae412f53d8ef94ffd74b23c071e..81af52fe9bfb48f04058cf2f6e76714c4be497bc 100644
--- a/tests/lwip_sock_tcp/stack.h
+++ b/tests/lwip_sock_tcp/stack.h
@@ -7,8 +7,7 @@
  */
 
 /**
- * @defgroup
- * @ingroup
+ * @ingroup     tests
  * @brief
  * @{
  *
@@ -16,6 +15,7 @@
  * @brief
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
+ * @}
  */
 #ifndef STACK_H
 #define STACK_H
@@ -34,4 +34,3 @@ void _net_init(void);
 #endif
 
 #endif /* STACK_H */
-/** @} */
diff --git a/tests/lwip_sock_udp/constants.h b/tests/lwip_sock_udp/constants.h
index f3e251766ecbfb73fd6ecc10a332793752114239..4a15841a44e452414df5e8ccbe7471295595a0c7 100644
--- a/tests/lwip_sock_udp/constants.h
+++ b/tests/lwip_sock_udp/constants.h
@@ -7,8 +7,7 @@
  */
 
 /**
- * @defgroup
- * @ingroup
+ * @ingroup     tests
  * @brief
  * @{
  *
@@ -16,6 +15,7 @@
  * @brief
  *
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
+ * @}
  */
 #ifndef CONSTANTS_H
 #define CONSTANTS_H
@@ -46,4 +46,3 @@ extern "C" {
 #endif
 
 #endif /* CONSTANTS_H */
-/** @} */
diff --git a/tests/lwip_sock_udp/stack.c b/tests/lwip_sock_udp/stack.c
index cdde693b293c0b09bb378892d66256684aaa2687..5ee8a581df25afc185440206a41e7757a94c65c0 100644
--- a/tests/lwip_sock_udp/stack.c
+++ b/tests/lwip_sock_udp/stack.c
@@ -11,6 +11,7 @@
  *
  * @file
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
+ * @}
  */
 
 
@@ -412,5 +413,3 @@ bool _check_6packet(const ipv6_addr_t *src, const ipv6_addr_t *dst,
     return false;
 #endif
 }
-
-/** @} */
diff --git a/tests/lwip_sock_udp/stack.h b/tests/lwip_sock_udp/stack.h
index c428faeb04de09032246a7726694b11b1b3d1062..4a98fa88d286f32e36461ba0b5d9282a13cf8752 100644
--- a/tests/lwip_sock_udp/stack.h
+++ b/tests/lwip_sock_udp/stack.h
@@ -7,8 +7,7 @@
  */
 
 /**
- * @defgroup
- * @ingroup
+ * @ingroup     tests
  * @brief
  * @{
  *
@@ -16,6 +15,7 @@
  * @brief
  *
  * @author  Martine Lenders <mlenders@inf.fu-berlin.de>
+ * @}
  */
 #ifndef STACK_H
 #define STACK_H
@@ -130,4 +130,3 @@ bool _check_6packet(const ipv6_addr_t *src, const ipv6_addr_t *dst,
 #endif
 
 #endif /* STACK_H */
-/** @} */
diff --git a/tests/minimal/main.c b/tests/minimal/main.c
index 529075c38dcfb52d1538aaf2f106edcc0a0f912a..93d25571ece843cef44df1623506be6279ab4a6e 100644
--- a/tests/minimal/main.c
+++ b/tests/minimal/main.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     test
+ * @ingroup     tests
  * @{
  *
  * @file
diff --git a/tests/pkg_cayenne-lpp/main.c b/tests/pkg_cayenne-lpp/main.c
index aea933fd0b093c5347e3ee336f90e7825b460cf3..97acd139efb511093e6dc8d15f9ae0e2d481ed6d 100644
--- a/tests/pkg_cayenne-lpp/main.c
+++ b/tests/pkg_cayenne-lpp/main.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     test
+ * @ingroup     tests
  * @{
  *
  * @file
diff --git a/tests/pkg_minmea/main.c b/tests/pkg_minmea/main.c
index 5381bfb8220f7b9eefd2fddb7c371b9ca0d28e37..f4ca2de0e1ed4a99b04cbeeef8e90e6c851c50fa 100644
--- a/tests/pkg_minmea/main.c
+++ b/tests/pkg_minmea/main.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     test
+ * @ingroup     tests
  * @{
  *
  * @file
diff --git a/tests/thread_race/main.c b/tests/thread_race/main.c
index 72b9ccb63d5e31bb80b42d0063bd31c5b13faed0..eb0f3332a058a3f24f1fbe23db1f63c6ce3375b6 100644
--- a/tests/thread_race/main.c
+++ b/tests/thread_race/main.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     test
+ * @ingroup     tests
  * @{
  *
  * @file
diff --git a/tests/unittests/tests-ecc/tests-ecc.c b/tests/unittests/tests-ecc/tests-ecc.c
index 8069d3e1c24bdba1fd12ae3583012b3e7c816e58..23aace76c2390fafa5622db43e399f22b6f5e700 100644
--- a/tests/unittests/tests-ecc/tests-ecc.c
+++ b/tests/unittests/tests-ecc/tests-ecc.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     fs
+ * @ingroup     unittests
  * @brief
  * @{
  *