diff --git a/Libraries/nunit/nunit-agent-x86.exe b/Libraries/nunit/nunit-agent-x86.exe
deleted file mode 100644
index 5547d07d0..000000000
Binary files a/Libraries/nunit/nunit-agent-x86.exe and /dev/null differ
diff --git a/Libraries/nunit/nunit-agent-x86.exe.config b/Libraries/nunit/nunit-agent-x86.exe.config
deleted file mode 100644
index de2caf60f..000000000
--- a/Libraries/nunit/nunit-agent-x86.exe.config
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <!--
-   The .NET 2.0 build of nunit-agent only 
-   runs under .NET 2.0 or higher. The setting
-   useLegacyV2RuntimeActivationPolicy only applies 
-   under .NET 4.0 and permits use of mixed mode 
-   assemblies, which would otherwise not load 
-   correctly. 
-  -->
-  <startup useLegacyV2RuntimeActivationPolicy="true">
-    <!--
-     Nunit-agent is normally run by the console or gui
-     runners and not independently. In normal usage, 
-     the runner specifies which runtime should be used.
-     
-     Do NOT add any supportedRuntime elements here, 
-     since they may prevent the runner from controlling 
-     the runtime that is used!
-    -->
-  </startup>
-
-  <runtime>
-    <!-- Ensure that test exceptions don't crash NUnit -->
-    <legacyUnhandledExceptionPolicy enabled="1" />
-
-    <!-- Run partial trust V2 assemblies in full trust under .NET 4.0 -->
-    <loadFromRemoteSources enabled="true" />
-
-    <!-- Look for addins in the addins directory for now -->
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <probing privatePath="lib;addins"/>
-   </assemblyBinding>
-
-  </runtime>
-  
-</configuration>
\ No newline at end of file
diff --git a/Libraries/nunit/nunit-agent.exe b/Libraries/nunit/nunit-agent.exe
deleted file mode 100644
index 637b2562b..000000000
Binary files a/Libraries/nunit/nunit-agent.exe and /dev/null differ
diff --git a/Libraries/nunit/nunit-agent.exe.config b/Libraries/nunit/nunit-agent.exe.config
deleted file mode 100644
index de2caf60f..000000000
--- a/Libraries/nunit/nunit-agent.exe.config
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <!--
-   The .NET 2.0 build of nunit-agent only 
-   runs under .NET 2.0 or higher. The setting
-   useLegacyV2RuntimeActivationPolicy only applies 
-   under .NET 4.0 and permits use of mixed mode 
-   assemblies, which would otherwise not load 
-   correctly. 
-  -->
-  <startup useLegacyV2RuntimeActivationPolicy="true">
-    <!--
-     Nunit-agent is normally run by the console or gui
-     runners and not independently. In normal usage, 
-     the runner specifies which runtime should be used.
-     
-     Do NOT add any supportedRuntime elements here, 
-     since they may prevent the runner from controlling 
-     the runtime that is used!
-    -->
-  </startup>
-
-  <runtime>
-    <!-- Ensure that test exceptions don't crash NUnit -->
-    <legacyUnhandledExceptionPolicy enabled="1" />
-
-    <!-- Run partial trust V2 assemblies in full trust under .NET 4.0 -->
-    <loadFromRemoteSources enabled="true" />
-
-    <!-- Look for addins in the addins directory for now -->
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <probing privatePath="lib;addins"/>
-   </assemblyBinding>
-
-  </runtime>
-  
-</configuration>
\ No newline at end of file
diff --git a/Libraries/nunit/nunit-console-runner.dll b/Libraries/nunit/nunit-console-runner.dll
deleted file mode 100644
index e637d6523..000000000
Binary files a/Libraries/nunit/nunit-console-runner.dll and /dev/null differ
diff --git a/Libraries/nunit/nunit-console-x86.exe b/Libraries/nunit/nunit-console-x86.exe
deleted file mode 100644
index 672a80ee5..000000000
Binary files a/Libraries/nunit/nunit-console-x86.exe and /dev/null differ
diff --git a/Libraries/nunit/nunit-console-x86.exe.config b/Libraries/nunit/nunit-console-x86.exe.config
deleted file mode 100644
index 81e5346c8..000000000
--- a/Libraries/nunit/nunit-console-x86.exe.config
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-	<!--
-   The .NET 2.0 build of the console runner only 
-   runs under .NET 2.0 or higher. The setting
-   useLegacyV2RuntimeActivationPolicy only applies 
-   under .NET 4.0 and permits use of mixed mode 
-   assemblies, which would otherwise not load 
-   correctly.
-  -->
-	<startup useLegacyV2RuntimeActivationPolicy="true">
-		<!-- Comment out the next line to force use of .NET 4.0 -->
-	</startup>
-	<runtime>
-		<!-- Ensure that test exceptions don't crash NUnit -->
-		<legacyUnhandledExceptionPolicy enabled="1"/>
-		<!-- Run partial trust V2 assemblies in full trust under .NET 4.0 -->
-		<loadFromRemoteSources enabled="true"/>
-		<!-- Look for addins in the addins directory for now -->
-		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-			<probing privatePath="lib;addins"/>
-		</assemblyBinding>
-	</runtime>
-</configuration>
diff --git a/Libraries/nunit/nunit.core.dll b/Libraries/nunit/nunit.core.dll
deleted file mode 100644
index 1c5778255..000000000
Binary files a/Libraries/nunit/nunit.core.dll and /dev/null differ
diff --git a/Libraries/nunit/nunit.core.interfaces.dll b/Libraries/nunit/nunit.core.interfaces.dll
deleted file mode 100644
index 941d4931d..000000000
Binary files a/Libraries/nunit/nunit.core.interfaces.dll and /dev/null differ
diff --git a/Libraries/nunit/nunit.framework.dll b/Libraries/nunit/nunit.framework.dll
deleted file mode 100644
index 3e24ba1ca..000000000
Binary files a/Libraries/nunit/nunit.framework.dll and /dev/null differ
diff --git a/Libraries/nunit/nunit.util.dll b/Libraries/nunit/nunit.util.dll
deleted file mode 100644
index c837e9ecf..000000000
Binary files a/Libraries/nunit/nunit.util.dll and /dev/null differ
diff --git a/build.ps1 b/build.ps1
index d474ad6b4..2a7957610 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,11 +1,6 @@
-param (
-    [switch]$runTests = $false
- )
-
 $msBuild = 'C:\Windows\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe'
 $outputFolder = '.\_output'
-$testSearchPattern = '*.Test\bin\x86\Release'
-$testPackageFolder = '.\_tests\'
+
 
 Function Build()
 {
@@ -61,6 +56,10 @@ Function PackageTests()
 {
     Write-Host Packaging Tests
 
+    $testPackageFolder = '.\_tests\'
+
+    .\.nuget\NuGet.exe install NUnit.Runners -Version 2.6.1 -Output $testPackageFolder 
+
     if(Test-Path $testPackageFolder)
     {
         Remove-Item -Recurse -Force $testPackageFolder -ErrorAction Continue
@@ -80,18 +79,6 @@ Function PackageTests()
     get-childitem $testPackageFolder -File -Filter *log.config | foreach ($_) {remove-item $_.fullname}
 }
 
-Function Nunit()
-{
-    $testFiles
-
-    get-childitem $testPackageFolder -File -Filter *test.dll | foreach ($_) {
-       $testFiles = $testFiles + $_.FullName + " "
-    }
-
-    $nunitExe =  '.\Libraries\nunit\nunit-console-x86.exe ' + $testFiles + ' /process:multiple /noxml'
-    Invoke-Expression  $nunitExe
-    CheckExitCode
-}
 
 Function RunGrunt()
 {
@@ -114,9 +101,4 @@ Function CheckExitCode()
 
 Build
 RunGrunt
-PackageTests
-
-if($runTests)
-{
-    Nunit
-}
+PackageTests
\ No newline at end of file
diff --git a/tests_mono.sh b/tests_mono.sh
index 5e3749a34..ac5676997 100644
--- a/tests_mono.sh
+++ b/tests_mono.sh
@@ -1,5 +1,6 @@
-NUNIT="./Libraries/nunit/nunit-console-x86.exe"
 EXCLUDE="/exclude:Windows"
-TESTDIR="."
+TESTDIR=.
+NUNIT=$TESTDIR/NUnit.Runners.2.6.1/tools/nunit-console-x86.exe
+
 mono $NUNIT $EXCLUDE  /xml:NzbDrone.Libraries.Result.xml $TESTDIR/NzbDrone.Libraries.Test.dll
 mono $NUNIT $EXCLUDE  /xml:NzbDrone.Libraries.Common.Result.xm $TESTDIR/NzbDrone.Common.Test.dll
\ No newline at end of file