diff --git a/dirs.proj b/dirs.proj
index a356a8fc6d..a25489b1c0 100644
--- a/dirs.proj
+++ b/dirs.proj
@@ -1,5 +1,7 @@
 <Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
+    <!-- Build Avalonia.Build.Tasks first because everything depends on it -->
+    <ProjectReference Include="src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj" />
     <ProjectReference Include="src/**/*.*proj" />
     <ProjectReference Include="samples/**/*.*proj" />
     <ProjectReference Include="tests/**/*.*proj" />
@@ -8,6 +10,8 @@
     <ProjectReference Remove="src/Markup/Avalonia.Markup.Xaml/PortableXaml/**/*.*proj" />
     <ProjectReference Remove="src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github/**/*.*proj" />
     <ProjectReference Remove="tests/Avalonia.ReactiveUI.Events.UnitTests/Avalonia.ReactiveUI.Events.UnitTests.csproj" />
+    <ProjectReference Remove="samples/ControlCatalog.Android/ControlCatalog.Android.csproj" />
+    <ProjectReference Remove="src/Android/Avalonia.AndroidTestApplication.csproj" />
   </ItemGroup>
   <ItemGroup Condition="!Exists('$(MSBuildExtensionsPath)\Xamarin\iOS')">
     <ProjectReference Remove="src/iOS/**/*.*proj" />
@@ -21,7 +25,6 @@
   <!-- Build android projects only on Windows, where we have installed android workload -->
   <ItemGroup Condition="!$([MSBuild]::IsOsPlatform('Windows'))">
     <ProjectReference Remove="src/Android/**/*.*proj" />
-    <ProjectReference Remove="samples/ControlCatalog.Android/ControlCatalog.Android.csproj" />
   </ItemGroup>
 
   <ItemGroup>