diff --git a/src/Orchard.Tests/Environment/DefaultWorkContextAccessorTests.cs b/src/Orchard.Tests/Environment/DefaultWorkContextAccessorTests.cs
index e70ac0c2e..47f72ecb6 100644
--- a/src/Orchard.Tests/Environment/DefaultWorkContextAccessorTests.cs
+++ b/src/Orchard.Tests/Environment/DefaultWorkContextAccessorTests.cs
@@ -1,5 +1,6 @@
 using System.Web;
 using Autofac;
+using Moq;
 using NUnit.Framework;
 using Orchard.Environment;
 using Orchard.Mvc;
@@ -27,6 +28,13 @@ namespace Orchard.Tests.Environment {
             container.Mock<IHttpContextAccessor>()
                 .Setup(x => x.Current())
                 .Returns(() => _httpContextCurrent);
+
+            container.Mock<IHttpContextAccessor>()
+                .Setup(x => x.CreateContext(It.IsAny<ILifetimeScope>()))
+                .Returns(() => new StubHttpContext());
+
+            container.Mock<IWorkContextEvents>()
+                .Setup(x => x.Started());
         }
 
         [Test]
diff --git a/src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs b/src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs
index b89e545ea..7f3b1784e 100644
--- a/src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs
+++ b/src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs
@@ -9,6 +9,7 @@ using Orchard.Environment.Descriptor;
 using Orchard.Environment.Descriptor.Models;
 using Orchard.Environment.ShellBuilders.Models;
 using Orchard.Mvc;
+using Orchard.Tests.Stubs;
 using Orchard.Tests.Utility;
 
 namespace Orchard.Tests.Environment.ShellBuilders {
@@ -32,6 +33,7 @@ namespace Orchard.Tests.Environment.ShellBuilders {
             var descriptor = new ShellDescriptor { SerialNumber = 6655321 };
             var blueprint = new ShellBlueprint();
             var shellLifetimeScope = _container.BeginLifetimeScope("shell");
+            var httpContext = new StubHttpContext();
 
             _container.Mock<IShellDescriptorCache>()
                 .Setup(x => x.Fetch(ShellSettings.DefaultName))
@@ -49,9 +51,16 @@ namespace Orchard.Tests.Environment.ShellBuilders {
                 .Setup(x => x.GetShellDescriptor())
                 .Returns(descriptor);
 
+            _container.Mock<IWorkContextEvents>()
+                .Setup(x => x.Started());
+
             _container.Mock<IHttpContextAccessor>()
                 .Setup(x => x.Current())
-                .Returns(default(HttpContextBase));
+                .Returns(httpContext);
+
+            _container.Mock<IHttpContextAccessor>()
+                .Setup(x => x.CreateContext(It.IsAny<ILifetimeScope>()))
+                .Returns(httpContext);
 
             var factory = _container.Resolve<IShellContextFactory>();
 
diff --git a/src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs b/src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs
index c7f6fe0bd..c788e4b21 100644
--- a/src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs
+++ b/src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs
@@ -11,6 +11,7 @@ using Orchard.Environment.State;
 using Orchard.Environment.Descriptor.Models;
 using Orchard.Events;
 using Orchard.Mvc;
+using Orchard.Tests.Stubs;
 using Orchard.Tests.Utility;
 
 namespace Orchard.Tests.Environment.State {
@@ -34,12 +35,17 @@ namespace Orchard.Tests.Environment.State {
                 LifetimeScope = _container.BeginLifetimeScope(),
             };
 
+            var httpContext = new StubHttpContext();
+
             _container.Mock<IShellContextFactory>()
                 .Setup(x => x.CreateDescribedContext(_shellContext.Settings, _shellContext.Descriptor))
                 .Returns(_shellContext);
             _container.Mock<IHttpContextAccessor>()
                 .Setup(x=>x.Current())
-                .Returns(default(HttpContextBase));
+                .Returns(httpContext);
+            _container.Mock<IHttpContextAccessor>()
+                .Setup(x => x.CreateContext(It.IsAny<ILifetimeScope>()))
+                .Returns(httpContext);
 
         }
 
diff --git a/src/Orchard.Tests/Tasks/SweepGeneratorTests.cs b/src/Orchard.Tests/Tasks/SweepGeneratorTests.cs
index 481383019..e851df66c 100644
--- a/src/Orchard.Tests/Tasks/SweepGeneratorTests.cs
+++ b/src/Orchard.Tests/Tasks/SweepGeneratorTests.cs
@@ -3,7 +3,9 @@ using Autofac;
 using Moq;
 using NUnit.Framework;
 using Orchard.Environment;
+using Orchard.Mvc;
 using Orchard.Tasks;
+using Orchard.Tests.Stubs;
 using Orchard.Tests.Utility;
 
 namespace Orchard.Tests.Tasks {
@@ -16,6 +18,19 @@ namespace Orchard.Tests.Tasks {
             builder.RegisterType<SweepGenerator>();
         }
 
+        protected override void Resolve(ILifetimeScope container) {
+            container.Mock<IHttpContextAccessor>()
+                .Setup(x => x.Current())
+                .Returns(() => null);
+
+            container.Mock<IHttpContextAccessor>()
+                .Setup(x => x.CreateContext(It.IsAny<ILifetimeScope>()))
+                .Returns(() => new StubHttpContext());
+
+            container.Mock<IWorkContextEvents>()
+                .Setup(x => x.Started());
+        }
+
         [Test]
         public void DoWorkShouldSendHeartbeatToTaskManager() {
             var heartbeatSource = _container.Resolve<SweepGenerator>();