diff --git a/src/Orchard.Tests/ContainerTestBase.cs b/src/Orchard.Tests/ContainerTestBase.cs
index 18625dbad..0bf447de8 100644
--- a/src/Orchard.Tests/ContainerTestBase.cs
+++ b/src/Orchard.Tests/ContainerTestBase.cs
@@ -14,6 +14,12 @@ namespace Orchard.Tests {
             Resolve(_container);
         }
 
+        [TearDown]
+        public void Cleanup() {
+            if (_container != null)
+                _container.Dispose();
+        }
+
 #if false
         // technically more accurate, and doesn't work
         [SetUp]