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 e44bed0510..e52aaf96e3 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
@@ -27,17 +27,21 @@ namespace Debugger.Tests {
 		[NUnit.Framework.Test]
 		public void ThreadName()
 		{
-			debugger.ProcessStarted += delegate(object sender, ProcessEventArgs e) {
-				e.Process.ThreadStarted += delegate(object sender2, ThreadEventArgs f) {
-					ObjectDump("ThreadStartedEvent", f.Thread);
-				};
-			};
+			debugger.ProcessStarted += debugger_ProcessStarted;
 			StartTest("ThreadName.cs");
+			debugger.ProcessStarted -= debugger_ProcessStarted;
 			ObjectDump("Thread", process.SelectedThread);
 			process.Continue();
 			ObjectDump("Thread", process.SelectedThread);
 			EndTest();
 		}
+
+		void debugger_ProcessStarted(object sender, ProcessEventArgs e)
+		{
+			e.Process.ThreadStarted += delegate(object sender2, ThreadEventArgs f) {
+				ObjectDump("ThreadStartedEvent", f.Thread);
+			};
+		}
 	}
 }
 #endif