diff --git a/features/frameworks/utest/utest/utest_default_handlers.h b/features/frameworks/utest/utest/utest_default_handlers.h
index 1d87c6bc8f..ad89963e19 100644
--- a/features/frameworks/utest/utest/utest_default_handlers.h
+++ b/features/frameworks/utest/utest/utest_default_handlers.h
@@ -38,6 +38,9 @@ namespace v1 {
      */
     static const struct
     {
+        ///@cond IGNORE
+        // Doxygen can't parse these implicit conversion operators properly, remove from
+        // doc build
         operator test_setup_handler_t()    const { return test_setup_handler_t(1); }
         operator test_teardown_handler_t() const { return test_teardown_handler_t(1); }
         operator test_failure_handler_t()  const { return test_failure_handler_t(1); }
@@ -45,6 +48,7 @@ namespace v1 {
         operator case_setup_handler_t()    const { return case_setup_handler_t(1); }
         operator case_teardown_handler_t() const { return case_teardown_handler_t(1); }
         operator case_failure_handler_t()  const { return case_failure_handler_t(1); }
+        ///@endcond
     } default_handler;
 
     /** Ignore handler hint.
@@ -55,6 +59,9 @@ namespace v1 {
      */
     static const struct
     {
+        ///@cond IGNORE
+        // Doxygen can't parse these implicit conversion operators properly, remove from
+        // doc build
         operator case_handler_t()            const { return case_handler_t(NULL); }
         operator case_control_handler_t()    const { return case_control_handler_t(NULL); }
         operator case_call_count_handler_t() const { return case_call_count_handler_t(NULL); }
@@ -66,6 +73,7 @@ namespace v1 {
         operator case_setup_handler_t()    const { return case_setup_handler_t(NULL); }
         operator case_teardown_handler_t() const { return case_teardown_handler_t(NULL); }
         operator case_failure_handler_t()  const { return case_failure_handler_t(NULL); }
+        ///@endcond
     } ignore_handler;
 
     /** A table of handlers.
diff --git a/features/frameworks/utest/utest/utest_types.h b/features/frameworks/utest/utest/utest_types.h
index 9da35463b9..9e4a1e6f91 100644
--- a/features/frameworks/utest/utest/utest_types.h
+++ b/features/frameworks/utest/utest/utest_types.h
@@ -30,6 +30,7 @@ namespace utest {
 /** @{*/
 namespace v1 {
 
+    /// repeat_t
     enum repeat_t {
         REPEAT_UNDECLR = 0,
         REPEAT_NONE    = 1,       ///< continue with the next test case
@@ -47,12 +48,14 @@ namespace v1 {
         REPEAT_HANDLER = REPEAT_CASE_ONLY | REPEAT_ON_VALIDATE              ///< repeat only the handler
     };
 
+    /// status_t
     enum status_t {
         STATUS_CONTINUE = -1,   ///< continues testing
         STATUS_IGNORE = -2,     ///< ignores failure and continues testing
         STATUS_ABORT = -3       ///< stops testing
     };
 
+    /// failure_reason_t
     enum failure_reason_t {
         REASON_NONE          = 0,           ///< No failure occurred
 
@@ -74,6 +77,7 @@ namespace v1 {
         REASON_IGNORE        = 0x8000       ///< The failure may be ignored
     };
 
+    /// location_t
     enum location_t {
         LOCATION_NONE = 0,      ///< No location information
         LOCATION_TEST_SETUP,    ///< A failure occurred in the test setup