diff --git a/tests/xharness/Jenkins/Jenkins.cs b/tests/xharness/Jenkins/Jenkins.cs
index c9f64c788b9..79363caa310 100644
--- a/tests/xharness/Jenkins/Jenkins.cs
+++ b/tests/xharness/Jenkins/Jenkins.cs
@@ -361,6 +361,12 @@ public void GenerateReport ()
 							continue;
 						}
 
+						var simulator = task as RunSimulatorTask;
+						if (simulator != null) {
+							allSimulatorTasks.Add (simulator);
+							continue;
+						}
+
 						if (task is DotNetTestTask dotnet) {
 							allDotNetTestTasks.Add (dotnet);
 							continue;
diff --git a/tests/xharness/Jenkins/RunSimulatorTasksFactory.cs b/tests/xharness/Jenkins/RunSimulatorTasksFactory.cs
index 479f400c07f..8b3dfb811cb 100644
--- a/tests/xharness/Jenkins/RunSimulatorTasksFactory.cs
+++ b/tests/xharness/Jenkins/RunSimulatorTasksFactory.cs
@@ -72,6 +72,9 @@ public async Task<IEnumerable<ITestTask>> CreateAsync (Jenkins jenkins, IProcess
 					tunnelBore: jenkins.TunnelBore,
 					candidates: candidates?.Cast<SimulatorDevice> () ?? test.Candidates)).ToList ();
 
+			if (jenkins.IsServerMode)
+				return testVariations;
+
 			foreach (var tv in testVariations) {
 				if (!tv.Ignored)
 					await tv.FindSimulatorAsync ();