diff --git a/include/irq_nextlevel.h b/include/irq_nextlevel.h
index ccda57d8e8b..520edc85bcb 100644
--- a/include/irq_nextlevel.h
+++ b/include/irq_nextlevel.h
@@ -130,10 +130,6 @@ static inline unsigned int irq_line_is_enabled_next_level(struct device *dev,
 	return api->intr_get_line_state(dev, irq);
 }
 
-/**
- * @}
- */
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/logging/log_instance.h b/include/logging/log_instance.h
index e2743eef95f..53eb3814b69 100644
--- a/include/logging/log_instance.h
+++ b/include/logging/log_instance.h
@@ -66,8 +66,6 @@ struct log_source_dynamic_data {
  * @brief Macro for initializing a pointer to the logger instance.
  */
 
-/** @} */
-
 #ifdef CONFIG_LOG
 
 #define LOG_INSTANCE_FULL_NAME(_module_name, _inst_name) \
diff --git a/kernel/include/kernel_arch_interface.h b/kernel/include/kernel_arch_interface.h
index 0c760a5b125..a282aef4f37 100644
--- a/kernel/include/kernel_arch_interface.h
+++ b/kernel/include/kernel_arch_interface.h
@@ -197,6 +197,7 @@ static inline bool arch_is_in_isr(void);
 /**
  * @defgroup arch-benchmarking Architecture-specific benchmarking globals
  * @ingroup arch-interface
+ * @{
  */
 
 #ifdef CONFIG_EXECUTION_BENCHMARKING
@@ -218,6 +219,7 @@ extern u64_t arch_timing_value_swap_temp;
 /**
  * @defgroup arch-misc Miscellaneous architecture APIs
  * @ingroup arch-interface
+ * @{
  */
 
 /**
diff --git a/tests/kernel/fp_sharing/float_disable/src/k_float_disable.c b/tests/kernel/fp_sharing/float_disable/src/k_float_disable.c
index 2a489add4dd..50f32e18e67 100644
--- a/tests/kernel/fp_sharing/float_disable/src/k_float_disable.c
+++ b/tests/kernel/fp_sharing/float_disable/src/k_float_disable.c
@@ -252,6 +252,3 @@ void test_k_float_disable_irq(void)
 	ztest_test_skip();
 }
 #endif /* CONFIG_ARM && CONFIG_DYNAMIC_INTERRUPTS */
-/**
- * @}
- */
diff --git a/tests/kernel/mem_protect/futex/src/main.c b/tests/kernel/mem_protect/futex/src/main.c
index f7e2143bf9c..83a7df50ac9 100644
--- a/tests/kernel/mem_protect/futex/src/main.c
+++ b/tests/kernel/mem_protect/futex/src/main.c
@@ -458,4 +458,3 @@ void test_main(void)
 			 ztest_unit_test(test_futex_wait_nowait));
 	ztest_run_test_suite(test_futex);
 }
-/******************************************************************************/
diff --git a/tests/kernel/pipe/pipe_api/src/test_pipe_fail.c b/tests/kernel/pipe/pipe_api/src/test_pipe_fail.c
index ce4f0628ce1..d441e0602d5 100644
--- a/tests/kernel/pipe/pipe_api/src/test_pipe_fail.c
+++ b/tests/kernel/pipe/pipe_api/src/test_pipe_fail.c
@@ -102,8 +102,3 @@ void test_pipe_user_get_fail(void)
 	get_fail(p);
 }
 #endif
-
-
-/**
- * @}
- */