diff --git a/reactos/cmake/CMakeMacros.cmake b/reactos/cmake/CMakeMacros.cmake
index 36944d789a5..25a049782ad 100644
--- a/reactos/cmake/CMakeMacros.cmake
+++ b/reactos/cmake/CMakeMacros.cmake
@@ -673,7 +673,7 @@ function(start_module_group __name)
     if(DEFINED CURRENT_MODULE_GROUP)
         message(FATAL_ERROR "CURRENT_MODULE_GROUP is already set ('${CURRENT_MODULE_GROUP}')")
     endif()
-    set(CURRENT_MODULE_GROUP rostests PARENT_SCOPE)
+    set(CURRENT_MODULE_GROUP ${__name} PARENT_SCOPE)
 endfunction()
 
 function(end_module_group)
@@ -682,6 +682,7 @@ function(end_module_group)
     foreach(__module ${__modulelist})
         add_dependencies(${CURRENT_MODULE_GROUP} ${__module})
     endforeach()
+    unset(CURRENT_MODULE_GROUP PARENT_SCOPE)
 endfunction()
 
 function(preprocess_file __in __out)