diff --git a/build/ci/.azure-devops-unit-tests.yml b/build/ci/.azure-devops-unit-tests.yml
index 148ddfe2bd56..943938ccb592 100644
--- a/build/ci/.azure-devops-unit-tests.yml
+++ b/build/ci/.azure-devops-unit-tests.yml
@@ -9,11 +9,18 @@ jobs:
   pool:
     vmImage: ${{ parameters.vmImage }}
 
-  dependsOn: Pipeline_Validations
+  dependsOn: winui_convert_tree
 
   strategy:
     matrix:
-      Default_Compiler:
+      UWP:
+        UNO_UWP_BUILD: true
+        XAML_FLAVOR_BUILD: UWP 
+        ADDITIONAL_FLAGS: ''
+
+      WinUI:
+        UNO_UWP_BUILD: false
+        XAML_FLAVOR_BUILD: WinUI 
         ADDITIONAL_FLAGS: ''
 
       # Keep for future previews
@@ -35,6 +42,8 @@ jobs:
   - checkout: self
     clean: true
 
+  - template: templates/download-winui-converted-tree.yml
+
   - template: templates/nuget-cache.yml
     parameters:
       nugetPackages: $(NUGET_PACKAGES)
diff --git a/src/Uno.UI/UI/Xaml/Markup/Reader/XamlConstants.cs b/src/Uno.UI/UI/Xaml/Markup/Reader/XamlConstants.cs
index e2bbbf080a55..3cf9eb62c3c9 100644
--- a/src/Uno.UI/UI/Xaml/Markup/Reader/XamlConstants.cs
+++ b/src/Uno.UI/UI/Xaml/Markup/Reader/XamlConstants.cs
@@ -12,7 +12,7 @@ internal static class XamlConstants
 		public const string BundleResourcePrefix = "ms-appx:///";
 
 		public const string RootFoundationNamespace = "Windows.Foundation";
-		public const string RootWUINamespace = "Windows.UI";
+		public const string RootWUINamespace = "Windows" + ".UI"; // Keep split for the WinUI conversion tool
 		public const string RootMUINamespace = "Windows.UI";
 		public const string BaseXamlNamespace = "Windows.UI.Xaml";
 		public const string UnoXamlNamespace = "Windows.UI.Xaml";