diff --git a/src/Umbraco.Tests/CoreStrings/LegacyShortStringHelperTests.cs b/src/Umbraco.Tests/CoreStrings/LegacyShortStringHelperTests.cs
index fbdd242fe7..ba88bf447b 100644
--- a/src/Umbraco.Tests/CoreStrings/LegacyShortStringHelperTests.cs
+++ b/src/Umbraco.Tests/CoreStrings/LegacyShortStringHelperTests.cs
@@ -34,15 +34,13 @@ namespace Umbraco.Tests.CoreStrings
         [TearDown]
         public void TearDown()
         {
-            var currDir = new DirectoryInfo(TestHelpers.TestHelper.CurrentAssemblyDirectory);
-            
-            var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config");
-            if (File.Exists(umbracoSettingsFile))
-                File.Delete(umbracoSettingsFile);
+            //TODO: Deleting the umbracoSettings.config file makes a lot of tests fail
 
-            var configPath = Path.Combine(currDir.Parent.Parent.FullName, "config");
-            if (Directory.Exists(configPath))
-                Directory.Delete(configPath);
+            //var currDir = new DirectoryInfo(TestHelpers.TestHelper.CurrentAssemblyDirectory);
+            
+            //var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config");
+            //if (File.Exists(umbracoSettingsFile))
+            //    File.Delete(umbracoSettingsFile);
         }
 
 
diff --git a/src/Umbraco.Tests/LibraryTests.cs b/src/Umbraco.Tests/LibraryTests.cs
index d04dd9bf0d..fa365e8b0b 100644
--- a/src/Umbraco.Tests/LibraryTests.cs
+++ b/src/Umbraco.Tests/LibraryTests.cs
@@ -47,11 +47,13 @@ namespace Umbraco.Tests
 
 		public override void TearDown()
 		{
-            var currDir = new DirectoryInfo(TestHelper.CurrentAssemblyDirectory);
+            //TODO: Deleting the umbracoSettings.config file makes a lot of tests fail
 
-            var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config");
-            if (File.Exists(umbracoSettingsFile))
-                File.Delete(umbracoSettingsFile);
+            //var currDir = new DirectoryInfo(TestHelper.CurrentAssemblyDirectory);
+
+            //var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config");
+            //if (File.Exists(umbracoSettingsFile))
+            //    File.Delete(umbracoSettingsFile);
             
 			base.TearDown();
 			UmbracoContext.Current = null;
diff --git a/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs b/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs
index 37a0301f53..be51860e3f 100644
--- a/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs
@@ -83,11 +83,11 @@ namespace Umbraco.Tests.PublishedContent
 
         public override void TearDown()
         {
-            var currDir = new DirectoryInfo(TestHelper.CurrentAssemblyDirectory);
+            //var currDir = new DirectoryInfo(TestHelper.CurrentAssemblyDirectory);
 
-            var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config");
-            if (File.Exists(umbracoSettingsFile))
-                File.Delete(umbracoSettingsFile);
+            //var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config");
+            //if (File.Exists(umbracoSettingsFile))
+            //    File.Delete(umbracoSettingsFile);
 
             base.TearDown();
         }
diff --git a/src/Umbraco.Tests/Routing/NiceUrlProviderTests.cs b/src/Umbraco.Tests/Routing/NiceUrlProviderTests.cs
index 838a6177db..8d58c386b2 100644
--- a/src/Umbraco.Tests/Routing/NiceUrlProviderTests.cs
+++ b/src/Umbraco.Tests/Routing/NiceUrlProviderTests.cs
@@ -39,11 +39,13 @@ namespace Umbraco.Tests.Routing
 
         public void TearDown()
         {
-            var currDir = new DirectoryInfo(TestHelper.CurrentAssemblyDirectory);
+            //TODO: Deleting the umbracoSettings.config file makes a lot of tests fail
 
-            var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config");
-            if (File.Exists(umbracoSettingsFile))
-                File.Delete(umbracoSettingsFile);
+            //var currDir = new DirectoryInfo(TestHelper.CurrentAssemblyDirectory);
+
+            //var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config");
+            //if (File.Exists(umbracoSettingsFile))
+            //    File.Delete(umbracoSettingsFile);
         }
 
         protected override void FreezeResolution()