diff --git a/tests/Makefile b/tests/Makefile
index 862fed0212..f55e3941cf 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -12,7 +12,7 @@ endif
 
 MTOUCH=$(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/bin/mtouch
 
-XHARNESS_EXECUTABLE=xharness/bin/Debug/$(DOTNET_TFM)/xharness.dll
+XHARNESS_EXECUTABLE=xharness/bin/Debug/xharness.dll
 
 export MD_MTOUCH_SDK_ROOT=$(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)
 export MSBUILD_EXE_PATH=$(MONO_PREFIX)/lib/mono/msbuild/15.0/bin/MSBuild.dll
diff --git a/tests/mtouch/MTouch.cs b/tests/mtouch/MTouch.cs
index c77afd80c2..ca13b39368 100644
--- a/tests/mtouch/MTouch.cs
+++ b/tests/mtouch/MTouch.cs
@@ -4509,7 +4509,7 @@ public class Dummy {
 				environment_variables ["SKIP_SIMULATOR_SETUP"] = "1";
 			environment_variables ["USE_TCP_TUNNEL"] = null;
 
-			var executable = Path.Combine (Configuration.RootPath, "tests", "xharness", "bin", "Debug", Configuration.DotNetTfm, "xharness");
+			var executable = Path.Combine (Configuration.RootPath, "tests", "xharness", "bin", "Debug", "xharness");
 			var args = new List<string> ();
 			args.Add ("--run");
 			args.Add (csprojpath);
diff --git a/tests/xharness/.vscode/launch.json b/tests/xharness/.vscode/launch.json
new file mode 100644
index 0000000000..085b39d605
--- /dev/null
+++ b/tests/xharness/.vscode/launch.json
@@ -0,0 +1,23 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "C#: xharness Debug Site",
+            "preLaunchTask": "dotnet: build",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "${workspaceFolder}/bin/Debug/xharness.dll",
+            "args": [
+                "--verbose",
+                "--jenkins:server",
+                "--autoconf",
+                "--rootdir",
+                "..",
+            ],
+            "cwd": "${workspaceFolder}",
+        }
+    ]
+}
\ No newline at end of file
diff --git a/tests/xharness/.vscode/tasks.json b/tests/xharness/.vscode/tasks.json
new file mode 100644
index 0000000000..b1c79f68e6
--- /dev/null
+++ b/tests/xharness/.vscode/tasks.json
@@ -0,0 +1,12 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "dotnet",
+			"task": "build",
+			"group": "build",
+			"problemMatcher": [],
+			"label": "dotnet: build"
+		}
+	]
+}
\ No newline at end of file
diff --git a/tests/xharness/xharness.csproj b/tests/xharness/xharness.csproj
index 982c79a567..404b9173cc 100644
--- a/tests/xharness/xharness.csproj
+++ b/tests/xharness/xharness.csproj
@@ -9,6 +9,7 @@
     <EnableDefaultItems>false</EnableDefaultItems>
     <WarningsAsErrors>Nullable</WarningsAsErrors>
     <!--<Nullable>enable</Nullable>-->
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">