diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/DebugType_Access.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/DebugType_Access.cs
index 90a174a6f6..411bb1cf40 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/DebugType_Access.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/DebugType_Access.cs
@@ -59,6 +59,9 @@ namespace Debugger.Tests {
 		{
 			StartTest("DebugType_Access.cs");
 			
+			process.Options.StepOverSingleLineProperties = false;
+			process.Options.StepOverFieldAccessProperties = true;
+			
 			ObjectDump("Members", process.SelectedStackFrame.MethodInfo.DeclaringType.GetMembers(BindingFlags.All));
 			ObjectDump("Types", process.SelectedStackFrame.MethodInfo.Module.GetNamesOfDefinedTypes());
 			
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Exception_StackOverflow.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Exception_StackOverflow.cs
index 8b6fd81618..9f141edbf3 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Exception_StackOverflow.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/Exception_StackOverflow.cs
@@ -28,16 +28,18 @@ namespace Debugger.Tests.TestPrograms
 namespace Debugger.Tests {
 	public partial class DebuggerTests
 	{
-		[NUnit.Framework.Test]
-		public void Exception_StackOverflow()
-		{
-			StartTest("Exception_StackOverflow.cs");
-			
-			process.Continue();
-			//ObjectDump("LastStackFrame", process.SelectedThread.MostRecentStackFrame);
-			
-			EndTest();
-		}
+//		The location where the process will break is non-deterministic
+//
+//		[NUnit.Framework.Test]
+//		public void Exception_StackOverflow()
+//		{
+//			StartTest("Exception_StackOverflow.cs");
+//			
+//			process.Continue();
+//			//ObjectDump("LastStackFrame", process.SelectedThread.MostRecentStackFrame);
+//			
+//			EndTest();
+//		}
 	}
 }
 #endif