diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/Thread_Tests.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/Thread_Tests.cs
index ccce3fb7f1..49d9888ea6 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/Thread_Tests.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/Thread_Tests.cs
@@ -56,11 +56,11 @@ namespace Debugger.Tests {
     <ModuleLoaded>mscorlib.dll (No symbols)</ModuleLoaded>
     <ThreadStartedEvent>
       <Thread
-        Callstack="{void System.AppDomain.SetupDomain(Boolean allowRedirects, String path, String configFile)}"
+        Callstack="{void System.AppDomain.SetupDomain(Boolean allowRedirects, String path, String configFile, String[] propertyNames, String[] propertyValues)}"
         CurrentExceptionType="0"
         IsAtSafePoint="True"
         IsInValidState="True"
-        MostRecentStackFrame="void System.AppDomain.SetupDomain(Boolean allowRedirects, String path, String configFile)"
+        MostRecentStackFrame="void System.AppDomain.SetupDomain(Boolean allowRedirects, String path, String configFile, String[] propertyNames, String[] propertyValues)"
         Name=""
         Priority="Normal"
         RuntimeValue="null" />
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/WeakReferenceTests.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/WeakReferenceTests.cs
index 05a0d673fc..9c8afa5aa4 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/WeakReferenceTests.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/WeakReferenceTests.cs
@@ -14,8 +14,6 @@ using NUnit.Framework;
 namespace ICSharpCode.AvalonEdit
 {
 	[TestFixture]
-	[Ignore(".NET 4.0 Beta 2 seems to cause trouble here. With the same AvalonEdit binary, " +
-	        "the second inside this fixture fails depending on whether it runs in NUnit on .NET 3.5 or .NET 4.0.")]
 	public class WeakReferenceTests
 	{
 		[Test]
@@ -51,6 +49,7 @@ namespace ICSharpCode.AvalonEdit
 		}
 		
 		[Test]
+		[Ignore]
 		public void DocumentDoesNotHoldReferenceToTextArea()
 		{
 			bool collectedTextArea = false;
@@ -66,6 +65,7 @@ namespace ICSharpCode.AvalonEdit
 		}
 		
 		[Test]
+		[Ignore]
 		public void DocumentDoesNotHoldReferenceToTextEditor()
 		{
 			bool collectedTextEditor = false;