diff --git a/tests/common/DotNet.cs b/tests/common/DotNet.cs
index 0d0b0de7708..0775966f75e 100644
--- a/tests/common/DotNet.cs
+++ b/tests/common/DotNet.cs
@@ -222,6 +222,7 @@ public static ExecutionResult Execute (string verb, string project, Dictionary<s
 			case "publish":
 			case "restore":
 			case "run":
+			case "test":
 				var args = new List<string> ();
 				args.Add (verb);
 				args.Add (project);
@@ -288,11 +289,15 @@ public static ExecutionResult Execute (string verb, string project, Dictionary<s
 				Console.WriteLine ($"Binlog: {binlogPath}");
 
 				// Work around https://github.com/dotnet/msbuild/issues/8845
-				args.Add ("/v:diag");
-				args.Add ("/consoleloggerparameters:Verbosity=Quiet");
-				// vb does not have preview lang, so we force it to latest
-				if (project.EndsWith (".vbproj", StringComparison.OrdinalIgnoreCase))
-					args.Add ("/p:LangVersion=latest");
+				// Skip these for 'dotnet test' because they leak through '-- ' in
+				// RunArguments and get passed to the test runner as app arguments.
+				if (verb != "test") {
+					args.Add ("/v:diag");
+					args.Add ("/consoleloggerparameters:Verbosity=Quiet");
+					// vb does not have preview lang, so we force it to latest
+					if (project.EndsWith (".vbproj", StringComparison.OrdinalIgnoreCase))
+						args.Add ("/p:LangVersion=latest");
+				}
 				// End workaround
 
 				if (msbuildParallelism.HasValue) {
diff --git a/tests/dotnet/UnitTests/DotNetTestTest.cs b/tests/dotnet/UnitTests/DotNetTestTest.cs
new file mode 100644
index 00000000000..18ab86eca29
--- /dev/null
+++ b/tests/dotnet/UnitTests/DotNetTestTest.cs
@@ -0,0 +1,49 @@
+using Xamarin.Tests;
+
+#nullable enable
+
+namespace Xamarin.Tests {
+	[TestFixture]
+	public class DotNetTestTest : TestBaseClass {
+		[Test]
+		[TestCase (ApplePlatform.iOS, "iostest")]
+		[TestCase (ApplePlatform.TVOS, "tvostest")]
+		// macOS and Mac Catalyst don't use mlaunch (they use 'open' via Desktop.targets),
+		// so MTP support requires a different approach for these platforms.
+		// [TestCase (ApplePlatform.MacCatalyst, "maccatalysttest")]
+		// [TestCase (ApplePlatform.MacOSX, "macostest")]
+		public void DotNetTest (ApplePlatform platform, string template)
+		{
+			Configuration.IgnoreIfIgnoredPlatform (platform);
+
+			var tmpDir = Cache.CreateTemporaryDirectory ();
+			var outputDir = Path.Combine (tmpDir, template);
+			DotNet.AssertNew (outputDir, template);
+			var proj = Path.Combine (outputDir, $"{template}.csproj");
+
+			// Replace generated tests with a single passing test
+			var testFile = Path.Combine (outputDir, "Test1.cs");
+			File.WriteAllText (testFile, $@"namespace {template};
+
+[TestClass]
+public sealed class Test1 {{
+	[TestMethod]
+	public void TestMethod1 ()
+	{{
+	}}
+}}
+");
+
+			var properties = GetDefaultProperties ();
+
+			// Mobile platforms use mlaunch to run the app in the simulator.
+			// Override MlaunchPath if set via the environment variable.
+			var mlaunchPath = Environment.GetEnvironmentVariable ("MLAUNCH_PATH");
+			if (!string.IsNullOrEmpty (mlaunchPath)) {
+				properties ["MlaunchPath"] = mlaunchPath;
+			}
+
+			DotNet.Execute ("test", proj, properties);
+		}
+	}
+}