diff --git a/cmake_tests.cmake b/cmake_tests.cmake
index 6381b4c..4b19c48 100644
--- a/cmake_tests.cmake
+++ b/cmake_tests.cmake
@@ -16,7 +16,7 @@ Include                 ( CTest )
 Function ( ADD_CMAKE_TEST )
 
     Set                         ( OPTIONS COMMAND )
-    Set                         ( ONE_VALUE_ARGS NAME TARGET )
+    Set                         ( ONE_VALUE_ARGS NAME TARGET GROUP )
     Set                         ( MULTI_VALUE_ARGS )
     CMake_Parse_Arguments       ( ADD_CMAKE_TEST "${OPTIONS}" "${ONE_VALUE_ARGS}" "${MULTI_VALUE_ARGS}" ${ARGN} )
 
@@ -53,6 +53,13 @@ Function ( ADD_CMAKE_TEST )
                                   COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${ADD_CMAKE_TEST_COMMAND} )
     Add_Dependencies            ( tests run-${ADD_CMAKE_TEST_TARGET} )
 
+    If                          ( ADD_CMAKE_TEST_GROUP )
+        If                          ( NOT TARGET ${ADD_CMAKE_TEST_GROUP}-tests )
+            Add_Custom_Target           ( ${ADD_CMAKE_TEST_GROUP}-tests )
+        EndIf                       ( )
+        Add_Dependencies            ( ${ADD_CMAKE_TEST_GROUP}-tests run-${ADD_CMAKE_TEST_TARGET} )
+    EndIf                       ( )
+
     # CTest #######################################################################################
 
     Add_Test                    ( NAME ${ADD_CMAKE_TEST_NAME}