diff -uNr a/build/Makefile.in b/build/Makefile.in
--- a/build/Makefile.in	2016-08-31 15:31:04.615121392 +0200
+++ b/build/Makefile.in	2016-08-31 15:31:04.703114267 +0200
@@ -306,9 +306,7 @@
 	-r:./Mono.Debugger.dll				\
 	-r:./Mono.Debugger.Frontend.dll			\
 	-r:System.Runtime.Remoting			\
-	-r:nunit.framework				\
-	-r:nunit.core					\
-	-r:nunit.core.interfaces
+	-pkg:nunit2
 
 TEST_SRCLIST = \
 	$(top_srcdir)/test/testsuite/*.cs		\
@@ -339,9 +339,7 @@
 	-r:./Mono.Debugger.dll				\
 	-r:./Mono.Debugger.Frontend.dll			\
 	-r:./Mono.Debugger.Test.Framework.dll		\
-	-r:nunit.framework				\
-	-r:nunit.core					\
-	-r:nunit.core.interfaces
+	-pkg:nunit2
 
 DEBUGGER_TEST_SERVER_SRCLIST = \
 	$(top_srcdir)/test/framework/DebuggerTestServer.cs
@@ -349,10 +349,7 @@
 DEBUGGER_TEST_SERVER_DEPS = \
 	-r:Mono.Debugger.Test.Framework.dll		\
 	-r:System.Runtime.Remoting			\
-	-r:nunit.framework				\
-	-r:nunit.core					\
-	-r:nunit.core.interfaces			\
-	-r:nunit.util
+	-pkg:nunit2
 
 noinst_DATA = Mono.Debugger.dll.config
 CLEANFILES = *.exe *.mdb mdb AssemblyInfo.cs Mono.Debugger.dll.config \
diff -uNr a/test/framework/DebuggerTestHost.cs b/test/framework/DebuggerTestHost.cs
--- a/test/framework/DebuggerTestHost.cs	2016-08-31 15:31:04.647118801 +0200
+++ b/test/framework/DebuggerTestHost.cs	2016-08-31 15:31:04.811105523 +0200
@@ -72,7 +72,7 @@
 			}
 		}
 
-		public bool Run (TestInfo test, TestSuiteResult suite_result, string test_name, EventListener listener, ITestFilter filter, int timeout)
+		public bool Run (TestInfo test, TestResult suite_result, string test_name, EventListener listener, ITestFilter filter, int timeout)
 		{
 			listener = new ProxyListener (listener);
 
@@ -83,7 +83,7 @@
 			IAsyncResult ar = runner.BeginInvoke (test_name, null, filter, null, null);
 
 			if (!ar.AsyncWaitHandle.WaitOne (timeout) || !ar.IsCompleted) {
-				TestCaseResult error = new TestCaseResult (test);
+				TestResult error = new TestResult (test);
 				string msg = String.Format ("Timeout after {0} ms", timeout);
 				error.Failure (msg, null, FailureSite.Parent);
 				suite_result.AddResult (error);
@@ -97,12 +97,12 @@
 					return true;
 				}
 
-				TestCaseResult error = new TestCaseResult (test);
+				TestResult error = new TestResult (test);
 				error.Failure ("Unknown error", null, FailureSite.Parent);
 				suite_result.AddResult (error);
 				return false;
 			} catch (Exception ex) {
-				TestCaseResult error = new TestCaseResult (test);
+				TestResult error = new TestResult (test);
 				string msg = String.Format ("Unknown exception: {0}", ex);
 				error.Failure (msg, null, FailureSite.Parent);
 				suite_result.AddResult (error);
diff -uNr a/test/framework/DebuggerTestServer.cs b/test/framework/DebuggerTestServer.cs
--- a/test/framework/DebuggerTestServer.cs	2016-08-31 15:31:04.647118801 +0200
+++ b/test/framework/DebuggerTestServer.cs	2016-08-31 15:31:04.823104551 +0200
@@ -59,7 +59,7 @@
 	{
 		public const string DebuggerTestFixtureAttribute = "Mono.Debugger.Tests.DebuggerTestFixtureAttribute";
 
-		public override bool CanBuildFrom (Type type)
+		public bool CanBuildFrom (Type type)
 		{
 			return Reflect.HasAttribute (type, DebuggerTestFixtureAttribute, true);
 		}
diff -uNr a/test/framework/ProxyListener.cs b/test/framework/ProxyListener.cs
--- a/test/framework/ProxyListener.cs	2016-08-31 15:31:04.647118801 +0200
+++ b/test/framework/ProxyListener.cs	2016-08-31 15:31:04.759109733 +0200
@@ -34,7 +34,7 @@
 			listener.TestStarted (test_name);
 		}
 
-		public void TestFinished (TestCaseResult result)
+		public void TestFinished (TestResult result)
 		{
 			listener.TestFinished (result);
 		}
@@ -44,7 +44,7 @@
 			listener.SuiteStarted (test_name);
 		}
 
-		public void SuiteFinished (TestSuiteResult result)
+		public void SuiteFinished (TestResult result)
 		{
 			listener.SuiteFinished (result);
 		}
diff -uNr a/test/testsuite/NUnitAddIn.cs b/test/testsuite/NUnitAddIn.cs
--- a/test/testsuite/NUnitAddIn.cs	2016-08-31 15:31:04.651118477 +0200
+++ b/test/testsuite/NUnitAddIn.cs	2016-08-31 15:31:04.827104227 +0200
@@ -29,12 +29,12 @@
 			return true;
 		}
 
-		public override bool CanBuildFrom (Type type)
+		public bool CanBuildFrom (Type type)
 		{
 			return Reflect.HasAttribute (type, DebuggerTestFixtureAttribute, false);
 		}
 
-		protected override NUnit.Core.TestSuite MakeSuite (Type type)
+		protected NUnit.Core.TestSuite MakeSuite (Type type)
 		{
 			return new DebuggerTestSuite (type);
 		}
@@ -60,11 +60,11 @@
 
 		public override TestResult Run (EventListener listener, ITestFilter filter)
 		{
-			TestSuiteResult suite_result = new TestSuiteResult (new TestInfo (this), TestName.FullName);
+			TestResult suite_result = new TestResult (new TestInfo (this));
 
 			DebuggerTestHost host = DebuggerTestHost.Create ();
 			if (host == null) {
-				TestCaseResult error = new TestCaseResult (new TestInfo (this));
+				TestResult error = new TestResult (new TestInfo (this));
 				string msg = String.Format ("Failed to create DebuggerTestHost in {0}", FixtureType.Name);
 				error.Failure (msg, null, FailureSite.Parent);
 				suite_result.AddResult (error);