diff --git a/.gitignore b/.gitignore
index 8551df016..2975dd7ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -112,3 +112,4 @@ _output/
 _rawPackage/
 _dotTrace*
 _tests/
+*.Result.xml
diff --git a/Libraries/nunit/nunit-agent-x86.exe b/Libraries/nunit/nunit-agent-x86.exe
index 8800632f9..5547d07d0 100644
Binary files a/Libraries/nunit/nunit-agent-x86.exe and b/Libraries/nunit/nunit-agent-x86.exe differ
diff --git a/Libraries/nunit/nunit-agent-x86.exe.config b/Libraries/nunit/nunit-agent-x86.exe.config
new file mode 100644
index 000000000..de2caf60f
--- /dev/null
+++ b/Libraries/nunit/nunit-agent-x86.exe.config
@@ -0,0 +1,37 @@
+<?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
new file mode 100644
index 000000000..637b2562b
Binary files /dev/null and b/Libraries/nunit/nunit-agent.exe differ
diff --git a/Libraries/nunit/nunit-console-x86.exe b/Libraries/nunit/nunit-console-x86.exe
index 0f9a832d3..672a80ee5 100644
Binary files a/Libraries/nunit/nunit-console-x86.exe and b/Libraries/nunit/nunit-console-x86.exe differ
diff --git a/Libraries/nunit/nunit-console-x86.exe.config b/Libraries/nunit/nunit-console-x86.exe.config
index 8a6a2a6a6..81e5346c8 100644
--- a/Libraries/nunit/nunit-console-x86.exe.config
+++ b/Libraries/nunit/nunit-console-x86.exe.config
@@ -1,6 +1,6 @@
 <?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 
@@ -8,24 +8,17 @@
    assemblies, which would otherwise not load 
    correctly.
   -->
-  <startup useLegacyV2RuntimeActivationPolicy="true">
-    <!-- Comment out the next line to force use of .NET 4.0 -->
-    <supportedRuntime version="v2.0.50727" />
-    <supportedRuntime version="v4.0.30319" />
-  </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
+	<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.framework.dll b/Libraries/nunit/nunit.framework.dll
index 215767d2f..3e24ba1ca 100644
Binary files a/Libraries/nunit/nunit.framework.dll and b/Libraries/nunit/nunit.framework.dll differ
diff --git a/tests_mono.ps1 b/tests_mono.ps1
deleted file mode 100644
index 894c6faf8..000000000
--- a/tests_mono.ps1
+++ /dev/null
@@ -1,32 +0,0 @@
-$msBuild = 'C:\Windows\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe'
-$outputFolder = '.\_output'
-
-Function Build()
-{
-
-
-    $clean = $msbuild + " nzbdrone.sln /t:Clean /m"
-    $build = $msbuild + " nzbdrone.sln /p:Configuration=Release /p:Platform=x86 /t:Build"
-
-    if(Test-Path $outputFolder)
-    {
-        Remove-Item -Recurse -Force $outputFolder -ErrorAction Continue
-    }
-
-       
-    Invoke-Expression $clean
-    Invoke-Expression $build
-}
-
-Function Package()
-{
-    Write-Host Removing XMLDoc files
-    get-childitem $outputFolder -include *.xml -recurse | foreach ($_) {remove-item $_.fullname}
-
-    Write-Host Removing FluentValidation.resources
-    get-childitem $outputFolder -include FluentValidation.resources.dll -recurse | foreach ($_) {remove-item $_.fullname}
-}
-
-
-Build
-Package
\ No newline at end of file
diff --git a/tests_mono.sh b/tests_mono.sh
new file mode 100644
index 000000000..5e3749a34
--- /dev/null
+++ b/tests_mono.sh
@@ -0,0 +1,5 @@
+NUNIT="./Libraries/nunit/nunit-console-x86.exe"
+EXCLUDE="/exclude:Windows"
+TESTDIR="."
+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