diff --git a/Cpp.Build.props b/Cpp.Build.props
index 4b8a206306..5acfbdee1a 100644
--- a/Cpp.Build.props
+++ b/Cpp.Build.props
@@ -2,6 +2,12 @@
 <Project ToolsVersion="4.0"
   xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <!-- Skip building C++ test projects when BuildTests=false -->
+  <PropertyGroup Condition="'$(_IsSkippedTestProject)' == 'true'">
+    <UsePrecompiledHeaders>false</UsePrecompiledHeaders>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+  </PropertyGroup>
+
   <!-- Project configurations -->
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
diff --git a/Directory.Build.props b/Directory.Build.props
index b04b875b97..9f5e65e00f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -22,17 +22,19 @@
   <!--
     Completely skip building test projects when BuildTests=false (e.g., Release pipeline).
     This avoids InternalsVisibleTo/signing issues by not compiling test code at all.
-    Match: projects ending in UnitTests, UITests, FuzzTests, .Test, .Tests, UnitTest, or in a folder named Tests.
+    Match: projects ending in Test, Tests, UnitTests, UITests, FuzzTests, or in a folder named Tests.
+    Also matches projects starting with UnitTests- (e.g., UnitTests-CommonLib).
     Also removes all PackageReference/ProjectReference to prevent NuGet restore and dependency builds.
   -->
   <PropertyGroup Condition="'$(BuildTests)' == 'false'">
     <_ProjectName>$(MSBuildProjectName)</_ProjectName>
-    <_IsSkippedTestProject Condition="$(_ProjectName.EndsWith('UnitTests'))">true</_IsSkippedTestProject>
-    <_IsSkippedTestProject Condition="$(_ProjectName.EndsWith('UITests'))">true</_IsSkippedTestProject>
-    <_IsSkippedTestProject Condition="$(_ProjectName.EndsWith('FuzzTests'))">true</_IsSkippedTestProject>
-    <_IsSkippedTestProject Condition="$(_ProjectName.EndsWith('.Test'))">true</_IsSkippedTestProject>
-    <_IsSkippedTestProject Condition="$(_ProjectName.EndsWith('.Tests'))">true</_IsSkippedTestProject>
-    <_IsSkippedTestProject Condition="$(_ProjectName.EndsWith('UnitTest'))">true</_IsSkippedTestProject>
+    <!-- Match any project ending with "Test" or "Tests" (covers UnitTests, UITests, FuzzTests, etc.) -->
+    <_IsSkippedTestProject Condition="$(_ProjectName.EndsWith('Test'))">true</_IsSkippedTestProject>
+    <_IsSkippedTestProject Condition="$(_ProjectName.EndsWith('Tests'))">true</_IsSkippedTestProject>
+    <!-- Match projects starting with UnitTests- or UITest- prefix -->
+    <_IsSkippedTestProject Condition="$(_ProjectName.StartsWith('UnitTests-'))">true</_IsSkippedTestProject>
+    <_IsSkippedTestProject Condition="$(_ProjectName.StartsWith('UITest-'))">true</_IsSkippedTestProject>
+    <!-- Match projects in a Tests folder -->
     <_IsSkippedTestProject Condition="$(MSBuildProjectDirectory.Contains('\Tests\'))">true</_IsSkippedTestProject>
   </PropertyGroup>
 
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 844f1f6450..9b631688d0 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -37,7 +37,8 @@
     <RebuildDependsOn />
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(_IsSkippedTestProject)' == 'true'">
+  <!-- For C# projects: remove all items -->
+  <ItemGroup Condition="'$(_IsSkippedTestProject)' == 'true' and '$(MSBuildProjectExtension)' == '.csproj'">
     <PackageReference Remove="@(PackageReference)" />
     <ProjectReference Remove="@(ProjectReference)" />
     <Reference Remove="@(Reference)" />
@@ -48,4 +49,21 @@
     <Using Remove="@(Using)" />
     <GlobalUsing Remove="@(GlobalUsing)" />
   </ItemGroup>
+
+  <!-- For C++ projects (vcxproj): remove all compile/link items to prevent build -->
+  <ItemGroup Condition="'$(_IsSkippedTestProject)' == 'true' and '$(MSBuildProjectExtension)' == '.vcxproj'">
+    <ClCompile Remove="@(ClCompile)" />
+    <ClInclude Remove="@(ClInclude)" />
+    <Link Remove="@(Link)" />
+    <Lib Remove="@(Lib)" />
+    <ProjectReference Remove="@(ProjectReference)" />
+    <None Remove="@(None)" />
+    <ResourceCompile Remove="@(ResourceCompile)" />
+    <Midl Remove="@(Midl)" />
+  </ItemGroup>
+
+  <!-- For C++ skipped test projects: override targets to no-op -->
+  <Target Name="Build" Condition="'$(_IsSkippedTestProject)' == 'true' and '$(MSBuildProjectExtension)' == '.vcxproj'" />
+  <Target Name="Rebuild" Condition="'$(_IsSkippedTestProject)' == 'true' and '$(MSBuildProjectExtension)' == '.vcxproj'" />
+  <Target Name="Clean" Condition="'$(_IsSkippedTestProject)' == 'true' and '$(MSBuildProjectExtension)' == '.vcxproj'" />
 </Project>