diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_DetermineAzurePipelinesTestJobs.cs b/build-tools/xaprepare/xaprepare/Steps/Step_DetermineAzurePipelinesTestJobs.cs
index 1ba34a5cfbd..2b4d33acaad 100644
--- a/build-tools/xaprepare/xaprepare/Steps/Step_DetermineAzurePipelinesTestJobs.cs
+++ b/build-tools/xaprepare/xaprepare/Steps/Step_DetermineAzurePipelinesTestJobs.cs
@@ -61,6 +61,10 @@ protected override async Task<bool> Execute (Context context)
 					testAreas.Add ("Designer");
 				}
 
+				if (file.Contains ("external/debugger-libs")) {
+					testAreas.Add ("MSBuildDevice");
+				}
+
 				if (file.Contains ("external/Java.Interop")) {
 					testAreas.Add ("MSBuild");
 					testAreas.Add ("MSBuildDevice");
diff --git a/external/debugger-libs b/external/debugger-libs
index c53676b0800..793b1d64c40 160000
--- a/external/debugger-libs
+++ b/external/debugger-libs
@@ -1 +1 @@
-Subproject commit c53676b08005c806fc170b7be5cda25e52fe9054
+Subproject commit 793b1d64c4029c77e44393e26e604ee957d168bb