diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.targets
index 8d48d505226..352c3c25612 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.targets
@@ -20,4 +20,7 @@
     <ProjectCapability Include="AndroidApplication" Condition="$(AndroidApplication)" />
   </ItemGroup>
 
+  <!-- NOTE: We have to replace the Run target after Microsoft.NET.Sdk.targets are imported -->
+  <Target Name="Run" DependsOnTargets="Publish;Install;StartAndroidActivity" />
+
 </Project>
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs
index dc8960c8744..eb36f9b4e17 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs
@@ -85,6 +85,13 @@ public bool Publish (string target = null)
 			return Execute (arguments.ToArray ());
 		}
 
+		public bool Run ()
+		{
+			//TODO: this should eventually run `dotnet run --project foo.csproj`
+			var arguments = GetDefaultCommandLineArgs ("publish", "Run");
+			return Execute (arguments.ToArray ());
+		}
+
 		public IEnumerable<string> LastBuildOutput {
 			get {
 				if (!string.IsNullOrEmpty (BuildLogFile) && File.Exists (BuildLogFile)) {
diff --git a/tests/MSBuildDeviceIntegration/Tests/XASdkDeployTests.cs b/tests/MSBuildDeviceIntegration/Tests/XASdkDeployTests.cs
index 114c905319b..f7e9ff3209e 100644
--- a/tests/MSBuildDeviceIntegration/Tests/XASdkDeployTests.cs
+++ b/tests/MSBuildDeviceIntegration/Tests/XASdkDeployTests.cs
@@ -36,8 +36,7 @@ public void DotNetInstallAndRun ([Values (false, true)] bool isRelease)
 			proj.CopyNuGetConfig (relativeProjDir);
 			var dotnet = new DotNetCLI (proj, Path.Combine (fullProjDir, proj.ProjectFilePath));
 
-			Assert.IsTrue (dotnet.Publish ("Install"), "`dotnet publish /t:Install` should succeed");
-			AdbStartActivity ($"{proj.PackageName}/{proj.JavaPackageName}.MainActivity");
+			Assert.IsTrue (dotnet.Run (), "`dotnet run` should succeed");
 			bool didLaunch = WaitForActivityToStart (proj.PackageName, "MainActivity",
 				Path.Combine (fullProjDir, "logcat.log"), 30);
 			RunAdbCommand ($"uninstall {proj.PackageName}");