diff --git a/cpukit/doxygen.h b/cpukit/doxygen.h
index 669c11df56..13c8f04f39 100644
--- a/cpukit/doxygen.h
+++ b/cpukit/doxygen.h
@@ -32,6 +32,14 @@
  * @brief Legacy Benchmark Drivers
  */
 
+/**
+ * @defgroup RTEMSTimeTest27Support Time Test 27 Support
+ *
+ * @ingroup RTEMSDeviceDrivers
+ *
+ * @brief Time Test 27 Support
+ */
+
 /**
  * @defgroup libfs libfs
  * 
diff --git a/cpukit/include/rtems/tm27-default.h b/cpukit/include/rtems/tm27-default.h
index 2a4a34384e..099f5a6805 100644
--- a/cpukit/include/rtems/tm27-default.h
+++ b/cpukit/include/rtems/tm27-default.h
@@ -20,9 +20,9 @@
 #define __tm27_h
 
 /**
- *  @defgroup shared_tm27 Time Test 27
+ *  @defgroup shared_tm27 Time Test 27 Default
  *
- *  @ingroup shared_include
+ *  @ingroup RTEMSTimeTest27Support
  *
  *  @brief Stuff for Time Test 27
  */