diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
index 311cb1f391..3b1c328731 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
@@ -16,7 +16,7 @@ namespace Umbraco.Tests.PublishedContent
         public override void Initialize()
         {
             base.Initialize();
-
+            
             UmbracoSettings.SettingsFilePath = Core.IO.IOHelper.MapPath(Core.IO.SystemDirectories.Config + Path.DirectorySeparatorChar, false);
 
             PropertyEditorValueConvertersResolver.Current = new PropertyEditorValueConvertersResolver(
@@ -47,7 +47,7 @@ namespace Umbraco.Tests.PublishedContent
         public override void TearDown()
         {
             base.TearDown();
-
+            
             PropertyEditorValueConvertersResolver.Reset();
             PublishedContentStoreResolver.Reset();
             PublishedMediaStoreResolver.Reset();
diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
index 02cd000239..12329efacb 100644
--- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
+++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
@@ -51,9 +51,6 @@ namespace Umbraco.Tests.Routing
 		{
 			base.Initialize();
 			
-			//the module requires that the singleton is setup
-			ApplicationContext.Current = ApplicationContext;
-
 			//create the module
 			_module = new UmbracoModule();
 
diff --git a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
index 757f83d9fc..cefd53fafd 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
@@ -33,6 +33,8 @@ namespace Umbraco.Tests.TestHelpers
 				TestHelper.InitializeDatabase();
 			Resolution.Freeze();
 			ApplicationContext = new ApplicationContext() { IsReady = true };
+            //init the singleton too!
+            ApplicationContext.Current = ApplicationContext;
 			//we need to clear out all currently created template files
 			var masterPages = new DirectoryInfo(IOHelper.MapPath(SystemDirectories.Masterpages));
 			masterPages.GetFiles().ForEach(x => x.Delete());