diff --git a/Release/tests/Common/UnitTestpp/dirs.proj b/Release/tests/Common/UnitTestpp/dirs.proj
index d13eb6cfea..cfe5739b04 100644
--- a/Release/tests/Common/UnitTestpp/dirs.proj
+++ b/Release/tests/Common/UnitTestpp/dirs.proj
@@ -17,7 +17,7 @@
       <ProjectFile Include="VS12\TestUnitTestpp120.vcxproj"/>
   </ItemGroup>
   
-  <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|120' or '$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
+  <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
     <ProjectFile Include="VS12.winrt\UnitTestpp120.winrt.vcxproj" />
   </ItemGroup>
 
diff --git a/Release/tests/Common/utilities/dirs.proj b/Release/tests/Common/utilities/dirs.proj
index dc924b6ca2..bb4678e543 100644
--- a/Release/tests/Common/utilities/dirs.proj
+++ b/Release/tests/Common/utilities/dirs.proj
@@ -16,7 +16,7 @@
       <ProjectFile Include="VS12.xp\CommonUtilities120.xp.vcxproj"  Condition="'$(Platform)'!='ARM'"/>
   </ItemGroup>
   
-  <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|120' or '$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
+  <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
       <ProjectFile Include="VS12.winrt\CommonUtilities120.winrt.vcxproj" />
   </ItemGroup>
 
diff --git a/Release/tests/Functional/http/client/AuthListener/VS12/AuthListener120.csproj b/Release/tests/Functional/http/client/AuthListener/VS12/AuthListener120.csproj
index 089a687210..2035f91aca 100644
--- a/Release/tests/Functional/http/client/AuthListener/VS12/AuthListener120.csproj
+++ b/Release/tests/Functional/http/client/AuthListener/VS12/AuthListener120.csproj
@@ -12,7 +12,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' OR '$(Configuration)|$(Platform)' == 'Debug|Win32' OR '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' OR '$(Configuration)|$(Platform)' == 'Debug|Win32' OR '$(Configuration)|$(Platform)' == 'Debug|x64' OR '$(Configuration)|$(Platform)' == 'Debug|ARM'">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -22,7 +22,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' OR '$(Configuration)|$(Platform)' == 'Release|Win32' OR '$(Configuration)|$(Platform)' == 'Release|x64' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' OR '$(Configuration)|$(Platform)' == 'Release|Win32' OR '$(Configuration)|$(Platform)' == 'Release|x64' OR '$(Configuration)|$(Platform)' == 'Release|ARM' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
diff --git a/Release/tests/Functional/http/client/dirs.proj b/Release/tests/Functional/http/client/dirs.proj
index dc252d2b13..d05851463c 100644
--- a/Release/tests/Functional/http/client/dirs.proj
+++ b/Release/tests/Functional/http/client/dirs.proj
@@ -22,7 +22,7 @@
       <ProjectFile Include="VS12\HttpClient120_test.vcxproj" />
   </ItemGroup>
   
-  <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|120' or '$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
+  <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
       <ProjectFile Include="VS12.winrt\HttpClient120_test.winrt.vcxproj" />
   </ItemGroup>
   
diff --git a/Release/tests/Functional/http/utilities/dirs.proj b/Release/tests/Functional/http/utilities/dirs.proj
index cf9a0f4034..b57bc14bf2 100644
--- a/Release/tests/Functional/http/utilities/dirs.proj
+++ b/Release/tests/Functional/http/utilities/dirs.proj
@@ -18,7 +18,7 @@
       <ProjectFile Include="VS12\HttpTestUtilities120.vcxproj" />
   </ItemGroup>
   
-  <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|120' or '$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
+  <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
       <ProjectFile Include="VS12.winrt\HttpTestUtilities120.winrt.vcxproj" />
   </ItemGroup>
 
diff --git a/Release/tests/Functional/json/dirs.proj b/Release/tests/Functional/json/dirs.proj
index e1c410994f..ceebe5cab3 100644
--- a/Release/tests/Functional/json/dirs.proj
+++ b/Release/tests/Functional/json/dirs.proj
@@ -20,7 +20,7 @@
       <ProjectFile Include="VS12.xp\JSON120_test.xp.vcxproj" Condition="'$(Platform)'!='ARM'" /> 
   </ItemGroup>
   
-  <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|120' or '$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
+  <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
       <ProjectFile Include="VS12.winrt\JSON120_test.winrt.vcxproj" />
   </ItemGroup>
 
diff --git a/Release/tests/Functional/pplx/pplx_test/VS12.winrt/pplx120_test.winrt.vcxproj b/Release/tests/Functional/pplx/pplx_test/VS12.winrt/pplx120_test.winrt.vcxproj
index 996c130305..fb8f1661c6 100644
--- a/Release/tests/Functional/pplx/pplx_test/VS12.winrt/pplx120_test.winrt.vcxproj
+++ b/Release/tests/Functional/pplx/pplx_test/VS12.winrt/pplx120_test.winrt.vcxproj
@@ -212,14 +212,14 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(TestRoot)\Common\utilities\vs12\CommonUtilities120.vcxproj">
-      <Project>{0c9d50d9-94fb-4732-a4ad-58e068315bb2}</Project>
+    <ProjectReference Include="$(TestRoot)\Common\utilities\vs12.winrt\CommonUtilities120.winrt.vcxproj">
+      <Project>{ea2d69a1-55c8-4c15-805e-de7e85872484}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(CasablancaSrcDir)\build\casablanca120.winrt.vcxproj">
-      <Project>{9AD285A2-301E-47A0-A299-14AD5D4F2758}</Project>
+    <ProjectReference Include="$(TestRoot)\Common\UnitTestpp\vs12.winrt\UnitTestpp120.winrt.vcxproj">
+      <Project>{B341AA9C-F38B-4D59-B6B7-8F22491090B7}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(TestRoot)\Common\UnitTestpp\vs11\UnitTestpp120.vcxproj">
-      <Project>{3EB86C0D-432C-4FFC-BAD4-8DF4EFC7D0FF}</Project>
+    <ProjectReference Include="$(CasablancaSrcDir)\build\casablanca120.winrt.vcxproj">
+      <Project>{198ED804-2655-4D92-8104-C220E3EA9452}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/Release/tests/Functional/pplx/pplx_test/dirs.proj b/Release/tests/Functional/pplx/pplx_test/dirs.proj
index a9bdef23c1..cbd2fb592b 100644
--- a/Release/tests/Functional/pplx/pplx_test/dirs.proj
+++ b/Release/tests/Functional/pplx/pplx_test/dirs.proj
@@ -20,7 +20,7 @@
       <ProjectFile Include="VS11.winrt\pplx110_test.winrt.vcxproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|120' or '$(OsVersion)|$(DevToolsVersion)'=='6.3|110'">
+  <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
       <ProjectFile Include="VS12.winrt\pplx120_test.winrt.vcxproj" />
   </ItemGroup>
 
diff --git a/Release/tests/Functional/streams/dirs.proj b/Release/tests/Functional/streams/dirs.proj
index 1cda13ffca..e9ba14c7e8 100644
--- a/Release/tests/Functional/streams/dirs.proj
+++ b/Release/tests/Functional/streams/dirs.proj
@@ -20,7 +20,7 @@
       <ProjectFile Include="VS12.xp\streams120_test.xp.vcxproj" Condition="'$(Platform)'!='ARM'" />
   </ItemGroup>
   
-  <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|120' or '$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
+  <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
       <ProjectFile Include="VS12.winrt\streams120_test.winrt.vcxproj" />
   </ItemGroup>
   
diff --git a/Release/tests/Functional/uri/dirs.proj b/Release/tests/Functional/uri/dirs.proj
index 0d49f381ee..056226e227 100644
--- a/Release/tests/Functional/uri/dirs.proj
+++ b/Release/tests/Functional/uri/dirs.proj
@@ -20,7 +20,7 @@
       <ProjectFile Include="VS12.xp\Uri120_test.xp.vcxproj" Condition="'$(Platform)'!='ARM'" />
   </ItemGroup>
   
-  <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|120' or '$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
+  <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
       <ProjectFile Include="VS12.winrt\URI120_test.winrt.vcxproj" />
   </ItemGroup>
 
diff --git a/Release/tests/Functional/utils/dirs.proj b/Release/tests/Functional/utils/dirs.proj
index d98366981f..c519c92ae8 100644
--- a/Release/tests/Functional/utils/dirs.proj
+++ b/Release/tests/Functional/utils/dirs.proj
@@ -20,7 +20,7 @@
       <ProjectFile Include="VS12.xp\Utils120_test.xp.vcxproj" Condition="'$(Platform)'!='ARM'" />
   </ItemGroup>
   
-  <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|120' or '$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
+  <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
       <ProjectFile Include="VS12.winrt\Utils120_test.winrt.vcxproj" />
   </ItemGroup>