diff --git a/Nuclex.Support.csproj b/Nuclex.Support.csproj
index bfc9c8c..0507dd1 100644
--- a/Nuclex.Support.csproj
+++ b/Nuclex.Support.csproj
@@ -37,9 +37,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\References\nmock\net-2.0\NMock2.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.4.6.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=2.5.0.8332, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\References\nunit\net-2.0\nunit.framework.dll</HintPath>
+      <HintPath>..\References\nunit\net-2.0\framework\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/Source/PathHelper.Test.cs b/Source/PathHelper.Test.cs
index bdf7a7e..152f5b0 100644
--- a/Source/PathHelper.Test.cs
+++ b/Source/PathHelper.Test.cs
@@ -24,7 +24,6 @@ using System.IO;
 #if UNITTEST
 
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace Nuclex.Support {
 
diff --git a/Source/Plugins/AssemblyLoadEventArgs.Test.cs b/Source/Plugins/AssemblyLoadEventArgs.Test.cs
index 8843546..06a5373 100644
--- a/Source/Plugins/AssemblyLoadEventArgs.Test.cs
+++ b/Source/Plugins/AssemblyLoadEventArgs.Test.cs
@@ -25,7 +25,6 @@ using System.IO;
 using System.Reflection;
 
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace Nuclex.Support.Plugins {
 
diff --git a/Source/Plugins/Employer.Test.cs b/Source/Plugins/Employer.Test.cs
index 5bd8b32..bec9864 100644
--- a/Source/Plugins/Employer.Test.cs
+++ b/Source/Plugins/Employer.Test.cs
@@ -24,7 +24,6 @@ using System;
 using System.IO;
 
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace Nuclex.Support.Plugins {
 
diff --git a/Source/Plugins/FactoryEmployer.Test.cs b/Source/Plugins/FactoryEmployer.Test.cs
index 35cca32..378f855 100644
--- a/Source/Plugins/FactoryEmployer.Test.cs
+++ b/Source/Plugins/FactoryEmployer.Test.cs
@@ -24,7 +24,6 @@ using System.IO;
 #if UNITTEST
 
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace Nuclex.Support.Plugins {
 
@@ -103,9 +102,7 @@ namespace Nuclex.Support.Plugins {
 
       Assert.AreEqual(1, testEmployer.Factories.Count);
       Assert.AreEqual(typeof(Derived), testEmployer.Factories[0].ConcreteType);
-      Assert.IsInstanceOfType(
-        typeof(Derived), testEmployer.Factories[0].CreateInstance()
-      );
+      Assert.IsInstanceOf<Derived>(testEmployer.Factories[0].CreateInstance());
     }
 
     /// <summary>
@@ -120,9 +117,7 @@ namespace Nuclex.Support.Plugins {
 
       Assert.AreEqual(1, testEmployer.Factories.Count);
       Assert.AreEqual(typeof(Unrelated), testEmployer.Factories[0].ConcreteType);
-      Assert.IsInstanceOfType(
-        typeof(Unrelated), testEmployer.Factories[0].CreateInstance()
-      );
+      Assert.IsInstanceOf<Unrelated>(testEmployer.Factories[0].CreateInstance());
     }
 
   }
diff --git a/Source/Plugins/InstanceEmployer.Test.cs b/Source/Plugins/InstanceEmployer.Test.cs
index 1db54d1..6ac72a9 100644
--- a/Source/Plugins/InstanceEmployer.Test.cs
+++ b/Source/Plugins/InstanceEmployer.Test.cs
@@ -24,7 +24,6 @@ using System.IO;
 #if UNITTEST
 
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace Nuclex.Support.Plugins {
 
@@ -104,7 +103,7 @@ namespace Nuclex.Support.Plugins {
 
       Assert.AreEqual(1, testEmployer.Instances.Count);
       Assert.AreEqual(typeof(Derived), testEmployer.Instances[0].GetType());
-      Assert.IsInstanceOfType(typeof(Derived), testEmployer.Instances[0]);
+      Assert.IsInstanceOf<Derived>(testEmployer.Instances[0]);
     }
 
     /// <summary>
@@ -119,7 +118,7 @@ namespace Nuclex.Support.Plugins {
 
       Assert.AreEqual(1, testEmployer.Instances.Count);
       Assert.AreEqual(typeof(Unrelated), testEmployer.Instances[0].GetType());
-      Assert.IsInstanceOfType(typeof(Unrelated), testEmployer.Instances[0]);
+      Assert.IsInstanceOf<Unrelated>(testEmployer.Instances[0]);
     }
 
   }
diff --git a/Source/Plugins/NoPluginAttribute.Test.cs b/Source/Plugins/NoPluginAttribute.Test.cs
index 0dc2d1b..1c8c63c 100644
--- a/Source/Plugins/NoPluginAttribute.Test.cs
+++ b/Source/Plugins/NoPluginAttribute.Test.cs
@@ -24,7 +24,6 @@ using System.IO;
 #if UNITTEST
 
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace Nuclex.Support.Plugins {
 
diff --git a/Source/Plugins/PluginHelper.Test.cs b/Source/Plugins/PluginHelper.Test.cs
index b6da1d7..62d636e 100644
--- a/Source/Plugins/PluginHelper.Test.cs
+++ b/Source/Plugins/PluginHelper.Test.cs
@@ -24,7 +24,6 @@ using System.IO;
 #if UNITTEST
 
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace Nuclex.Support.Plugins {
 
diff --git a/Source/Plugins/PluginHost.Test.cs b/Source/Plugins/PluginHost.Test.cs
index 5116020..b6122f5 100644
--- a/Source/Plugins/PluginHost.Test.cs
+++ b/Source/Plugins/PluginHost.Test.cs
@@ -25,7 +25,6 @@ using System.Reflection;
 #if UNITTEST
 
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace Nuclex.Support.Plugins {
 
diff --git a/Source/Plugins/PluginRepository.Test.cs b/Source/Plugins/PluginRepository.Test.cs
index 93119ad..8a1bbbe 100644
--- a/Source/Plugins/PluginRepository.Test.cs
+++ b/Source/Plugins/PluginRepository.Test.cs
@@ -26,7 +26,6 @@ using System.Reflection;
 #if UNITTEST
 
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 using NMock2;
 
 namespace Nuclex.Support.Plugins {
diff --git a/Source/Scheduling/AbortedException.Test.cs b/Source/Scheduling/AbortedException.Test.cs
index 43e39e3..b475a81 100644
--- a/Source/Scheduling/AbortedException.Test.cs
+++ b/Source/Scheduling/AbortedException.Test.cs
@@ -74,7 +74,7 @@ namespace Nuclex.Support.Scheduling {
         memory.Position = 0;
         object exception2 = formatter.Deserialize(memory);
 
-        Assert.IsInstanceOfType(typeof(AbortedException), exception2);
+        Assert.IsInstanceOf<AbortedException>(exception2);
         Assert.AreEqual(exception1.Message, ((AbortedException)exception2).Message);
       }
     }
diff --git a/Source/Shared.Test.cs b/Source/Shared.Test.cs
index 17b59e4..f4e8d16 100644
--- a/Source/Shared.Test.cs
+++ b/Source/Shared.Test.cs
@@ -24,7 +24,6 @@ using System.IO;
 #if UNITTEST
 
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace Nuclex.Support {
 
diff --git a/Source/StringHelper.Test.cs b/Source/StringHelper.Test.cs
index 1fad2a5..36a6c8a 100644
--- a/Source/StringHelper.Test.cs
+++ b/Source/StringHelper.Test.cs
@@ -24,7 +24,6 @@ using System.IO;
 #if UNITTEST
 
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace Nuclex.Support {
 
diff --git a/Source/StringSegment.Test.cs b/Source/StringSegment.Test.cs
index 9455ad6..5c7308c 100644
--- a/Source/StringSegment.Test.cs
+++ b/Source/StringSegment.Test.cs
@@ -24,7 +24,6 @@ using System.IO;
 #if UNITTEST
 
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace Nuclex.Support {
 
diff --git a/Source/Tracking/IdleStateEventArgs.Test.cs b/Source/Tracking/IdleStateEventArgs.Test.cs
index 12a590b..99beb22 100644
--- a/Source/Tracking/IdleStateEventArgs.Test.cs
+++ b/Source/Tracking/IdleStateEventArgs.Test.cs
@@ -24,7 +24,6 @@ using System.IO;
 #if UNITTEST
 
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace Nuclex.Support.Tracking {
 
diff --git a/Source/Tracking/Internal/ObservedWeightedTransaction.Test.cs b/Source/Tracking/Internal/ObservedWeightedTransaction.Test.cs
index 1928fd1..6005561 100644
--- a/Source/Tracking/Internal/ObservedWeightedTransaction.Test.cs
+++ b/Source/Tracking/Internal/ObservedWeightedTransaction.Test.cs
@@ -25,7 +25,6 @@ using System.Threading;
 #if UNITTEST
 
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 using NMock2;
 
 namespace Nuclex.Support.Tracking {
diff --git a/Source/Tracking/Internal/WeightedTransactionWrapperCollection.Test.cs b/Source/Tracking/Internal/WeightedTransactionWrapperCollection.Test.cs
index 941efc5..2e5f648 100644
--- a/Source/Tracking/Internal/WeightedTransactionWrapperCollection.Test.cs
+++ b/Source/Tracking/Internal/WeightedTransactionWrapperCollection.Test.cs
@@ -25,7 +25,6 @@ using System.Threading;
 #if UNITTEST
 
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 using NMock2;
 
 namespace Nuclex.Support.Tracking {
diff --git a/Source/Tracking/ProgressReportEventArgs.Test.cs b/Source/Tracking/ProgressReportEventArgs.Test.cs
index 40325c0..9d4acaf 100644
--- a/Source/Tracking/ProgressReportEventArgs.Test.cs
+++ b/Source/Tracking/ProgressReportEventArgs.Test.cs
@@ -24,7 +24,6 @@ using System.IO;
 #if UNITTEST
 
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace Nuclex.Support.Tracking {
 
diff --git a/Source/Tracking/StatusReportEventArgs.Test.cs b/Source/Tracking/StatusReportEventArgs.Test.cs
index fd4afdc..e075e5a 100644
--- a/Source/Tracking/StatusReportEventArgs.Test.cs
+++ b/Source/Tracking/StatusReportEventArgs.Test.cs
@@ -24,7 +24,6 @@ using System.IO;
 #if UNITTEST
 
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace Nuclex.Support.Tracking {
 
diff --git a/Source/Tracking/WeightedTransaction.Test.cs b/Source/Tracking/WeightedTransaction.Test.cs
index d2dd80f..8511456 100644
--- a/Source/Tracking/WeightedTransaction.Test.cs
+++ b/Source/Tracking/WeightedTransaction.Test.cs
@@ -24,7 +24,6 @@ using System.IO;
 #if UNITTEST
 
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace Nuclex.Support.Tracking {
 
diff --git a/Source/WeakReference.Test.cs b/Source/WeakReference.Test.cs
index 2de849e..8ff02f1 100644
--- a/Source/WeakReference.Test.cs
+++ b/Source/WeakReference.Test.cs
@@ -25,7 +25,6 @@ using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
 
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace Nuclex.Support {