diff --git a/include/drivers/edac.h b/include/drivers/edac.h
index b75f0f404e3..4417cc281b0 100644
--- a/include/drivers/edac.h
+++ b/include/drivers/edac.h
@@ -43,7 +43,8 @@ typedef int (*edac_api_notify_cb_set_f)(const struct device *dev,
 				      edac_notify_callback_f cb);
 
 /**
- * @defgroup edac Zephyr API
+ * @defgroup edac EDAC API
+ * @ingroup io_interfaces
  * @{
  */
 
diff --git a/include/pm/state.h b/include/pm/state.h
index 0b44b1baf78..7d049fc1e82 100644
--- a/include/pm/state.h
+++ b/include/pm/state.h
@@ -15,7 +15,8 @@ extern "C" {
 #endif
 
 /**
- * @defgroup pm_states Power Management states
+ * @defgroup pm_states Power Management States
+ * @ingroup power_management_api
  * @{
  */
 
diff --git a/include/sys/util.h b/include/sys/util.h
index 21d2772b858..3f0964c91b7 100644
--- a/include/sys/util.h
+++ b/include/sys/util.h
@@ -31,7 +31,7 @@ extern "C" {
 #endif
 
 /**
- * @defgroup sys-util Zephyr utilities
+ * @defgroup sys-util Utility Functions
  * @{
  */
 
diff --git a/subsys/testsuite/ztest/include/ztest.h b/subsys/testsuite/ztest/include/ztest.h
index 14078a4780d..c0b5fcc92cf 100644
--- a/subsys/testsuite/ztest/include/ztest.h
+++ b/subsys/testsuite/ztest/include/ztest.h
@@ -7,11 +7,11 @@
 /**
  * @file
  *
- * @brief Zephyr testing suite
+ * @brief Zephyr Testsuite
  */
 
 /**
- * @brief Zephyr Tests
+ * @brief Zephyr Tests (ZTest)
  * @defgroup all_tests Zephyr Tests
  * @{
  * @}
diff --git a/tests/kernel/tickless/tickless_concept/src/main.c b/tests/kernel/tickless/tickless_concept/src/main.c
index 1a85e769f34..cebd193c058 100644
--- a/tests/kernel/tickless/tickless_concept/src/main.c
+++ b/tests/kernel/tickless/tickless_concept/src/main.c
@@ -62,10 +62,12 @@ static void thread_tslice(void *p1, void *p2, void *p3)
 	k_sem_give(&sema);
 }
 /**
- * @addtogroup kernel_tickless_tests
+ * @defgroup  kernel_tickless_tests Tickless
+ * @ingroup all_tests
  * @{
  */
 
+
 /**
  * @brief Verify system clock with and without tickless idle
  *