diff --git a/TESTS/mbed_hal/critical_section/critical_section_test.h b/TESTS/mbed_hal/critical_section/critical_section_test.h
index 3a85684d98..4b0e5878ee 100644
--- a/TESTS/mbed_hal/critical_section/critical_section_test.h
+++ b/TESTS/mbed_hal/critical_section/critical_section_test.h
@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 
-/** \addtogroup hal_critical_tests
+/** \addtogroup hal_critical
  *  @{
+ *  \defgroup hal_critical_test Tests 
+ *  Tests definitions of the HAL Critical module.
+ *  @{ 
  */
 
 #ifndef MBED_CRITICAL_SECTION_TEST_H
@@ -45,7 +48,7 @@
 template <int N>
 void test_critical_section();
 
-
+/**@}*/
 /**@}*/
 
 #endif // MBED_CRITICAL_SECTION_TEST_H
diff --git a/TESTS/mbed_hal/qspi/qspi_test.h b/TESTS/mbed_hal/qspi/qspi_test.h
index 9ab3076d74..ca9458ccc9 100644
--- a/TESTS/mbed_hal/qspi/qspi_test.h
+++ b/TESTS/mbed_hal/qspi/qspi_test.h
@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 
-/** \addtogroup hal_qspi_tests
+/** \addtogroup hal_qspi
  *  @{
+ *  \defgroup hal_qspi_tests Tests
+ *  QSPI tests of the HAL.
+ *  @{ 
  */
 #ifndef MBED_QSPI_TEST_H
 #define MBED_QSPI_TEST_H
@@ -96,3 +99,4 @@ void qspi_write_read_test(void);
 #endif
 
 /** @}*/
+/** @}*/
diff --git a/TESTS/mbed_hal/sleep/sleep_test_utils.h b/TESTS/mbed_hal/sleep/sleep_test_utils.h
index bf5a522d03..bc886e6747 100644
--- a/TESTS/mbed_hal/sleep/sleep_test_utils.h
+++ b/TESTS/mbed_hal/sleep/sleep_test_utils.h
@@ -15,8 +15,11 @@
  */
 
 /**
- * @addtogroup hal_sleep_test_utils
+ * @addtogroup hal_sleep
  * @{
+ * @defgroup hal_sleep_test_util Tests
+ * Tests of the sleep HAL.
+ * @{     
  */
 
 #ifndef MBED_SLEEP_TEST_UTILS_H
@@ -112,3 +115,4 @@ void lp_ticker_isr(const ticker_data_t * const ticker_data)
 #endif
 
 /** @}*/
+/** @}*/