diff --git a/Tests/RunCMake/VS10Project/RunCMakeTest.cmake b/Tests/RunCMake/VS10Project/RunCMakeTest.cmake
index 22db7a586f..2d0c96e1a0 100644
--- a/Tests/RunCMake/VS10Project/RunCMakeTest.cmake
+++ b/Tests/RunCMake/VS10Project/RunCMakeTest.cmake
@@ -18,7 +18,6 @@ run_cmake(ExplicitCMakeLists)
 run_cmake(InterfaceLibSources)
 run_cmake(NoImpLib)
 run_cmake(RuntimeLibrary)
-run_cmake(SolutionItems)
 run_cmake(SourceGroupCMakeLists)
 run_cmake(SourceGroupTreeCMakeLists)
 run_cmake(SourceGroupFileSet)
@@ -45,7 +44,6 @@ run_cmake(VsDpiAwareBadParam)
 run_cmake(VsForceInclude)
 run_cmake(VsPrecompileHeaders)
 run_cmake(VsPrecompileHeadersShort)
-run_cmake(VsDeployEnabled)
 run_cmake(VsSettings)
 run_cmake(VsSourceSettingsTool)
 run_cmake(VsPlatformToolset)
diff --git a/Tests/RunCMake/VS10Project/VsDeployEnabled-check.cmake b/Tests/RunCMake/VSSolution/DeployEnabled-check.cmake
similarity index 96%
rename from Tests/RunCMake/VS10Project/VsDeployEnabled-check.cmake
rename to Tests/RunCMake/VSSolution/DeployEnabled-check.cmake
index 0ff8678e24..22b824c365 100644
--- a/Tests/RunCMake/VS10Project/VsDeployEnabled-check.cmake
+++ b/Tests/RunCMake/VSSolution/DeployEnabled-check.cmake
@@ -7,7 +7,7 @@ endif()
 # Test solution file for deployment.
 #
 
-set(vcSlnFile "${RunCMake_TEST_BINARY_DIR}/VsDeployEnabled.sln")
+set(vcSlnFile "${RunCMake_TEST_BINARY_DIR}/DeployEnabled.sln")
 if(NOT EXISTS "${vcSlnFile}")
   set(RunCMake_TEST_FAILED "Solution file ${vcSlnFile} does not exist.")
   return()
diff --git a/Tests/RunCMake/VS10Project/VsDeployEnabled.cmake b/Tests/RunCMake/VSSolution/DeployEnabled.cmake
similarity index 100%
rename from Tests/RunCMake/VS10Project/VsDeployEnabled.cmake
rename to Tests/RunCMake/VSSolution/DeployEnabled.cmake
diff --git a/Tests/RunCMake/VSSolution/RunCMakeTest.cmake b/Tests/RunCMake/VSSolution/RunCMakeTest.cmake
index 8737c9a2f9..328a0aaf98 100644
--- a/Tests/RunCMake/VSSolution/RunCMakeTest.cmake
+++ b/Tests/RunCMake/VSSolution/RunCMakeTest.cmake
@@ -1,6 +1,7 @@
 include(RunCMake)
 include(${CMAKE_CURRENT_LIST_DIR}/solution_parsing.cmake)
 
+run_cmake(DeployEnabled)
 run_cmake(OnePre)
 run_cmake(OnePost)
 run_cmake(MorePre)
@@ -9,6 +10,7 @@ run_cmake(PrePost)
 run_cmake(Override1)
 run_cmake(Override2)
 run_cmake(Override3)
+run_cmake(SolutionItems)
 run_cmake(StartupProject)
 run_cmake(StartupProjectMissing)
 run_cmake(AddPackageToDefault)
diff --git a/Tests/RunCMake/VS10Project/SolutionItems-check.cmake b/Tests/RunCMake/VSSolution/SolutionItems-check.cmake
similarity index 100%
rename from Tests/RunCMake/VS10Project/SolutionItems-check.cmake
rename to Tests/RunCMake/VSSolution/SolutionItems-check.cmake
diff --git a/Tests/RunCMake/VS10Project/SolutionItems.cmake b/Tests/RunCMake/VSSolution/SolutionItems.cmake
similarity index 100%
rename from Tests/RunCMake/VS10Project/SolutionItems.cmake
rename to Tests/RunCMake/VSSolution/SolutionItems.cmake
diff --git a/Tests/RunCMake/VS10Project/SolutionItems/CMakeLists.txt b/Tests/RunCMake/VSSolution/SolutionItems/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/VS10Project/SolutionItems/CMakeLists.txt
rename to Tests/RunCMake/VSSolution/SolutionItems/CMakeLists.txt
diff --git a/Tests/RunCMake/VS10Project/SolutionItems/extraneous.txt b/Tests/RunCMake/VSSolution/SolutionItems/extraneous.txt
similarity index 100%
rename from Tests/RunCMake/VS10Project/SolutionItems/extraneous.txt
rename to Tests/RunCMake/VSSolution/SolutionItems/extraneous.txt
diff --git a/Tests/RunCMake/VS10Project/solution-item-0-1.txt b/Tests/RunCMake/VSSolution/foo.cpp
similarity index 100%
rename from Tests/RunCMake/VS10Project/solution-item-0-1.txt
rename to Tests/RunCMake/VSSolution/foo.cpp
diff --git a/Tests/RunCMake/VS10Project/solution-item-1-1.txt b/Tests/RunCMake/VSSolution/solution-item-0-1.txt
similarity index 100%
rename from Tests/RunCMake/VS10Project/solution-item-1-1.txt
rename to Tests/RunCMake/VSSolution/solution-item-0-1.txt
diff --git a/Tests/RunCMake/VS10Project/solution-item-2-1.txt b/Tests/RunCMake/VSSolution/solution-item-1-1.txt
similarity index 100%
rename from Tests/RunCMake/VS10Project/solution-item-2-1.txt
rename to Tests/RunCMake/VSSolution/solution-item-1-1.txt
diff --git a/Tests/RunCMake/VS10Project/solution-item-2-2.txt b/Tests/RunCMake/VSSolution/solution-item-2-1.txt
similarity index 100%
rename from Tests/RunCMake/VS10Project/solution-item-2-2.txt
rename to Tests/RunCMake/VSSolution/solution-item-2-1.txt
diff --git a/Tests/RunCMake/VSSolution/solution-item-2-2.txt b/Tests/RunCMake/VSSolution/solution-item-2-2.txt
new file mode 100644
index 0000000000..e69de29bb2