diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 588f3a122..c7fe6493e 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -234,7 +234,7 @@ endif()
 
 if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
   add_RunCMake_test(include_external_msproject)
-  add_RunCMake_test(SolutionGlobalSections)
+  add_RunCMake_test(VSSolution)
 endif()
 
 if("${CMAKE_GENERATOR}" MATCHES "Visual Studio ([^789]|[789][0-9])")
diff --git a/Tests/RunCMake/SolutionGlobalSections/CMakeLists.txt b/Tests/RunCMake/VSSolution/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/SolutionGlobalSections/CMakeLists.txt
rename to Tests/RunCMake/VSSolution/CMakeLists.txt
diff --git a/Tests/RunCMake/SolutionGlobalSections/MorePost-check.cmake b/Tests/RunCMake/VSSolution/MorePost-check.cmake
similarity index 100%
rename from Tests/RunCMake/SolutionGlobalSections/MorePost-check.cmake
rename to Tests/RunCMake/VSSolution/MorePost-check.cmake
diff --git a/Tests/RunCMake/SolutionGlobalSections/MorePost.cmake b/Tests/RunCMake/VSSolution/MorePost.cmake
similarity index 100%
rename from Tests/RunCMake/SolutionGlobalSections/MorePost.cmake
rename to Tests/RunCMake/VSSolution/MorePost.cmake
diff --git a/Tests/RunCMake/SolutionGlobalSections/MorePre-check.cmake b/Tests/RunCMake/VSSolution/MorePre-check.cmake
similarity index 100%
rename from Tests/RunCMake/SolutionGlobalSections/MorePre-check.cmake
rename to Tests/RunCMake/VSSolution/MorePre-check.cmake
diff --git a/Tests/RunCMake/SolutionGlobalSections/MorePre.cmake b/Tests/RunCMake/VSSolution/MorePre.cmake
similarity index 100%
rename from Tests/RunCMake/SolutionGlobalSections/MorePre.cmake
rename to Tests/RunCMake/VSSolution/MorePre.cmake
diff --git a/Tests/RunCMake/SolutionGlobalSections/OnePost-check.cmake b/Tests/RunCMake/VSSolution/OnePost-check.cmake
similarity index 100%
rename from Tests/RunCMake/SolutionGlobalSections/OnePost-check.cmake
rename to Tests/RunCMake/VSSolution/OnePost-check.cmake
diff --git a/Tests/RunCMake/SolutionGlobalSections/OnePost.cmake b/Tests/RunCMake/VSSolution/OnePost.cmake
similarity index 100%
rename from Tests/RunCMake/SolutionGlobalSections/OnePost.cmake
rename to Tests/RunCMake/VSSolution/OnePost.cmake
diff --git a/Tests/RunCMake/SolutionGlobalSections/OnePre-check.cmake b/Tests/RunCMake/VSSolution/OnePre-check.cmake
similarity index 100%
rename from Tests/RunCMake/SolutionGlobalSections/OnePre-check.cmake
rename to Tests/RunCMake/VSSolution/OnePre-check.cmake
diff --git a/Tests/RunCMake/SolutionGlobalSections/OnePre.cmake b/Tests/RunCMake/VSSolution/OnePre.cmake
similarity index 100%
rename from Tests/RunCMake/SolutionGlobalSections/OnePre.cmake
rename to Tests/RunCMake/VSSolution/OnePre.cmake
diff --git a/Tests/RunCMake/SolutionGlobalSections/Override1-check.cmake b/Tests/RunCMake/VSSolution/Override1-check.cmake
similarity index 100%
rename from Tests/RunCMake/SolutionGlobalSections/Override1-check.cmake
rename to Tests/RunCMake/VSSolution/Override1-check.cmake
diff --git a/Tests/RunCMake/SolutionGlobalSections/Override1.cmake b/Tests/RunCMake/VSSolution/Override1.cmake
similarity index 100%
rename from Tests/RunCMake/SolutionGlobalSections/Override1.cmake
rename to Tests/RunCMake/VSSolution/Override1.cmake
diff --git a/Tests/RunCMake/SolutionGlobalSections/Override2-check.cmake b/Tests/RunCMake/VSSolution/Override2-check.cmake
similarity index 100%
rename from Tests/RunCMake/SolutionGlobalSections/Override2-check.cmake
rename to Tests/RunCMake/VSSolution/Override2-check.cmake
diff --git a/Tests/RunCMake/SolutionGlobalSections/Override2.cmake b/Tests/RunCMake/VSSolution/Override2.cmake
similarity index 100%
rename from Tests/RunCMake/SolutionGlobalSections/Override2.cmake
rename to Tests/RunCMake/VSSolution/Override2.cmake
diff --git a/Tests/RunCMake/SolutionGlobalSections/PrePost-check.cmake b/Tests/RunCMake/VSSolution/PrePost-check.cmake
similarity index 100%
rename from Tests/RunCMake/SolutionGlobalSections/PrePost-check.cmake
rename to Tests/RunCMake/VSSolution/PrePost-check.cmake
diff --git a/Tests/RunCMake/SolutionGlobalSections/PrePost.cmake b/Tests/RunCMake/VSSolution/PrePost.cmake
similarity index 100%
rename from Tests/RunCMake/SolutionGlobalSections/PrePost.cmake
rename to Tests/RunCMake/VSSolution/PrePost.cmake
diff --git a/Tests/RunCMake/SolutionGlobalSections/RunCMakeTest.cmake b/Tests/RunCMake/VSSolution/RunCMakeTest.cmake
similarity index 100%
rename from Tests/RunCMake/SolutionGlobalSections/RunCMakeTest.cmake
rename to Tests/RunCMake/VSSolution/RunCMakeTest.cmake
diff --git a/Tests/RunCMake/SolutionGlobalSections/solution_parsing.cmake b/Tests/RunCMake/VSSolution/solution_parsing.cmake
similarity index 100%
rename from Tests/RunCMake/SolutionGlobalSections/solution_parsing.cmake
rename to Tests/RunCMake/VSSolution/solution_parsing.cmake