diff --git a/src/testhost.x86/app.manifest b/src/testhost.x86/app.manifest
index f96f558728..af789108ba 100644
--- a/src/testhost.x86/app.manifest
+++ b/src/testhost.x86/app.manifest
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!-- Adding same as used in TPv1 Refer: /src/vset/Agile/TestPlatform/RocksteadyCLI/app.manifest -->
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <!-- The assemblyIdentity node is needed to fix a binding problem on Win2003 (PS72518) -->
@@ -7,6 +7,8 @@
     <application>
       <!-- Windows 10 -->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+      <!-- Enables Xaml Islands -->
+      <maxversiontested Id="10.0.18362.0"/>
       <!-- Windows 8.1 -->
       <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
       <!-- Windows Vista -->
diff --git a/src/testhost/app.manifest b/src/testhost/app.manifest
index 161dc3ad9e..af789108ba 100644
--- a/src/testhost/app.manifest
+++ b/src/testhost/app.manifest
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!-- Adding same as used in TPv1 Refer: /src/vset/Agile/TestPlatform/RocksteadyCLI/app.manifest -->
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <!-- The assemblyIdentity node is needed to fix a binding problem on Win2003 (PS72518) -->
@@ -7,6 +7,8 @@
     <application>
       <!-- Windows 10 -->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+      <!-- Enables Xaml Islands -->
+      <maxversiontested Id="10.0.18362.0"/>
       <!-- Windows 8.1 -->
       <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
       <!-- Windows Vista -->
@@ -24,4 +26,4 @@
       </requestedPrivileges>
     </security>
   </trustInfo>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/src/vstest.console/app.manifest b/src/vstest.console/app.manifest
index 9952698906..af789108ba 100644
--- a/src/vstest.console/app.manifest
+++ b/src/vstest.console/app.manifest
@@ -7,6 +7,8 @@
     <application>
       <!-- Windows 10 -->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+      <!-- Enables Xaml Islands -->
+      <maxversiontested Id="10.0.18362.0"/>
       <!-- Windows 8.1 -->
       <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
       <!-- Windows Vista -->
@@ -24,4 +26,4 @@
       </requestedPrivileges>
     </security>
   </trustInfo>
-</assembly>
\ No newline at end of file
+</assembly>