diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets
index 22816880d1b..3acf819495a 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets
@@ -21,9 +21,6 @@
     <_AndroidFastDeploymentSupported Condition=" Exists ('$(MSBuildThisFileDirectory)../tools/Xamarin.Android.Common.Debugging.targets') ">true</_AndroidFastDeploymentSupported>
     <_AndroidFastDeploymentSupported Condition=" '$(_AndroidFastDeploymentSupported)' == '' ">False</_AndroidFastDeploymentSupported>
 
-    <!-- TODO: remove when we have debugger support for CoreCLR -->
-    <UseMonoRuntime Condition=" '$(UseMonoRuntime)' == '' and '$(Configuration)' == 'Debug' ">true</UseMonoRuntime>
-
     <!--
       Disable @(Content) from referenced projects
       See: https://github.com/dotnet/sdk/blob/955c0fc7b06e2fa34bacd076ed39f61e4fb61716/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets#L16
diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
index 77772a2e32e..6cf1f0471cb 100644
--- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -2233,7 +2233,9 @@ public void StartAndroidActivityRespectsAndroidDeviceUserId ()
 		}
 
 		[Test]
-		public void DotNetNewAndroidTest ()
+		[TestCase (AndroidRuntime.MonoVM)]
+		[TestCase (AndroidRuntime.CoreCLR)]
+		public void DotNetNewAndroidTest (AndroidRuntime runtime)
 		{
 			var templateName = TestName;
 			var projectDirectory = Path.Combine (Root, "temp", templateName);
@@ -2244,12 +2246,22 @@ public void DotNetNewAndroidTest ()
 			var dotnet = new DotNetCLI (Path.Combine (projectDirectory, $"{templateName}.csproj"));
 			Assert.IsTrue (dotnet.New ("androidtest"), "`dotnet new androidtest` should succeed");
 
+			bool useMonoRuntime = runtime == AndroidRuntime.MonoVM;
+			var buildParameters = new List<string> {
+				$"UseMonoRuntime={useMonoRuntime}",
+			};
+
+			if (runtime == AndroidRuntime.CoreCLR) {
+				Assert.Ignore ("https://github.com/dotnet/android/issues/11174");
+			}
+
 			// Build and assert 0 warnings
-			Assert.IsTrue (dotnet.Build (), "`dotnet build` should succeed");
+			Assert.IsTrue (dotnet.Build (parameters: buildParameters.ToArray ()), "`dotnet build` should succeed");
 			dotnet.AssertHasNoWarnings ();
 
 			// Run instrumentation via `dotnet run` and capture output
-			using var process = dotnet.StartRun (waitForExit: true);
+			var runParameters = buildParameters.Select (p => $"/p:{p}").ToArray ();
+			using var process = dotnet.StartRun (waitForExit: true, parameters: runParameters);
 
 			var locker = new Lock ();
 			var output = new StringBuilder ();