diff --git a/src/Umbraco.Tests/IO/ShadowFileSystemTests.cs b/src/Umbraco.Tests/IO/ShadowFileSystemTests.cs
index 326e5e1369..94ce25cc98 100644
--- a/src/Umbraco.Tests/IO/ShadowFileSystemTests.cs
+++ b/src/Umbraco.Tests/IO/ShadowFileSystemTests.cs
@@ -15,12 +15,14 @@ namespace Umbraco.Tests.IO
         [SetUp]
         public void SetUp()
         {
+            SafeCallContext.Clear();
             ClearFiles();
         }
 
         [TearDown]
         public void TearDown()
         {
+            SafeCallContext.Clear();
             ClearFiles();
         }