diff --git a/lib/nunit/nunit-console.exe.config b/lib/nunit/nunit-console.exe.config
index f1af50101..3d5420463 100644
--- a/lib/nunit/nunit-console.exe.config
+++ b/lib/nunit/nunit-console.exe.config
@@ -29,7 +29,7 @@
   <runtime>
     <loadFromRemoteSources enabled="true" />
     <!-- We need this so test exceptions don't crash NUnit -->
-    <legacyUnhandledExceptionPolicy enabled="1" />
+    <legacyUnhandledExceptionPolicy enabled="0" />
 
     <!-- Look for addins in the addins directory for now -->
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
diff --git a/src/Orchard.Specs/Hosting/WebHostAgent.cs b/src/Orchard.Specs/Hosting/WebHostAgent.cs
index 919180a62..eb2a41726 100644
--- a/src/Orchard.Specs/Hosting/WebHostAgent.cs
+++ b/src/Orchard.Specs/Hosting/WebHostAgent.cs
@@ -1,5 +1,8 @@
 using System;
+using System.Threading;
+using System.Web;
 using System.Web.Hosting;
+using Orchard.Specs.Hosting.Orchard.Web;
 
 namespace Orchard.Specs.Hosting {
     public class WebHostAgent : MarshalByRefObject
@@ -11,11 +14,7 @@ namespace Orchard.Specs.Hosting {
         }
 
         public void Shutdown() {
-            //TODO: this line is required to properly shutdown the ASP.NET
-            //      host and release memory when running multiple SpecFlow tests.
-            //      However, nuint complains about an unhandled AppdomainUnloadedException
-            //      When we figure out a way around this, we will re-enable this line.
-            //HostingEnvironment.InitiateShutdown();
+            HostingEnvironment.InitiateShutdown();
         }
     }
 }