diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.NuGet.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.NuGet.targets
index 7f8eec453bb..b2fbfb610c0 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.NuGet.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.NuGet.targets
@@ -19,6 +19,8 @@ This file contains *temporary* workarounds for NuGet in .NET 5.
       It doesn't suffer from: https://github.com/NuGet/docs.microsoft.com-nuget/issues/1955
     -->
     <PackageTargetFallback>
+      net6.0-android$(TargetPlatformVersion).0;
+      monoandroid11.0;
       monoandroid10.0;
       monoandroid90;
       monoandroid81;
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs
index 1c7dfd626b7..4dc3517c98e 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs
@@ -355,6 +355,12 @@ public void DotNetBuild (string runtimeIdentifiers, bool isRelease)
 		{
 			var proj = new XASdkProject {
 				IsRelease = isRelease,
+				ExtraNuGetConfigSources = {
+					"https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json"
+				},
+				PackageReferences = {
+					new Package { Id = "Xamarin.AndroidX.AppCompat", Version = "1.2.0.7-net6preview01" }
+				},
 				Sources = {
 					new BuildItem ("EmbeddedResource", "Foo.resx") {
 						TextContent = () => InlineData.ResxWithContents ("<data name=\"CancelButton\"><value>Cancel</value></data>")
@@ -364,6 +370,7 @@ public void DotNetBuild (string runtimeIdentifiers, bool isRelease)
 					},
 				}
 			};
+			proj.MainActivity = proj.DefaultMainActivity.Replace (": Activity", ": AndroidX.AppCompat.App.AppCompatActivity");
 			proj.OtherBuildItems.Add (new AndroidItem.InputJar ("javaclasses.jar") {
 				BinaryContent = () => ResourceData.JavaSourceJarTestJar,
 			});