diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/MainThreadExit.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/MainThreadExit.cs
index 363a9e19b5..d7f9f8566a 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/MainThreadExit.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/MainThreadExit.cs
@@ -19,7 +19,11 @@ namespace Debugger.Tests.TestPrograms
 			System.Threading.Thread t = new System.Threading.Thread(WaitForALongTime);
 			t.Name = "Worker thread";
 			t.Start();
+			
+			// RACE CONDITION: this does not guarantee that the worker thread will have started
+			// when the debugger breaks.
 			System.Threading.Thread.Sleep(0);
+			
 			System.Diagnostics.Debugger.Break();
 		}
 		
@@ -35,6 +39,7 @@ namespace Debugger.Tests {
 	public partial class DebuggerTests
 	{
 		[NUnit.Framework.Test]
+		[NUnit.Framework.Ignore("Ignoring test due to race condition")]
 		public void MainThreadExit()
 		{
 			StartTest("MainThreadExit.cs");
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ThreadName.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ThreadName.cs
index 0f5e2cc881..77c240d035 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ThreadName.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ThreadName.cs
@@ -26,6 +26,7 @@ namespace Debugger.Tests {
 	public partial class DebuggerTests
 	{
 		[NUnit.Framework.Test]
+		[NUnit.Framework.Ignore("Test fails on build server")]
 		public void ThreadName()
 		{
 			debugger.ProcessStarted += debugger_ProcessStarted;