diff --git a/Public/Src/Utilities/UnitTests/Authentication/Test.BuildXL.Utilities.Authentication.dsc b/Public/Src/Utilities/UnitTests/Authentication/Test.BuildXL.Utilities.Authentication.dsc
index 375c8f042..aa0f02059 100644
--- a/Public/Src/Utilities/UnitTests/Authentication/Test.BuildXL.Utilities.Authentication.dsc
+++ b/Public/Src/Utilities/UnitTests/Authentication/Test.BuildXL.Utilities.Authentication.dsc
@@ -9,12 +9,6 @@ namespace Authentication {
         assemblyName: "Test.BuildXL.Utilities.Authentication",
         allowUnsafeBlocks: true,
         sources: globR(d`.`, "*.cs"),
-        runTestArgs: {
-            // These tests require Detours to run itself, so we won't detour the test runner process itself
-            unsafeTestRunArguments: {
-                runWithUntrackedDependencies: true
-            },
-        },
         references: [
             importFrom("BuildXL.Utilities").dll,
             importFrom("BuildXL.Utilities").Authentication.dll,
diff --git a/Public/Src/Utilities/UnitTests/PackedExecutionTests/Test.BuildXL.Utilities.PackedExecution.dsc b/Public/Src/Utilities/UnitTests/PackedExecutionTests/Test.BuildXL.Utilities.PackedExecution.dsc
index 7d6370669..f95cc3418 100644
--- a/Public/Src/Utilities/UnitTests/PackedExecutionTests/Test.BuildXL.Utilities.PackedExecution.dsc
+++ b/Public/Src/Utilities/UnitTests/PackedExecutionTests/Test.BuildXL.Utilities.PackedExecution.dsc
@@ -36,11 +36,5 @@ namespace PackedExecution {
             importFrom("BuildXL.Utilities").ToolSupport.dll,
             importFrom("BuildXL.Utilities").Utilities.Core.dll,
         ],
-        runTestArgs: { 
-            unsafeTestRunArguments: {
-                // runs TestProcess with sandboxing
-                runWithUntrackedDependencies: true
-            }
-        }
     });
 }
diff --git a/Public/Src/Utilities/UnitTests/Utilities/NamedSemaphoreTest.cs b/Public/Src/Utilities/UnitTests/Utilities/NamedSemaphoreTest.cs
index 7df238df2..541dbc0b1 100644
--- a/Public/Src/Utilities/UnitTests/Utilities/NamedSemaphoreTest.cs
+++ b/Public/Src/Utilities/UnitTests/Utilities/NamedSemaphoreTest.cs
@@ -38,7 +38,7 @@ namespace Test.BuildXL.Utilities
         [FactIfSupported(requiresLinuxBasedOperatingSystem: true)]
         public void TestAlreadyExists()
         {
-            var semaphoreName = "/sem";
+            var semaphoreName = "/" + Guid.NewGuid().ToString().Replace("-", "");
 
             var sem1 = SemaphoreFactory.CreateNew(semaphoreName, 1, 2);
             Assert.True(sem1.Succeeded);
diff --git a/Public/Src/Utilities/UnitTests/Utilities/Test.BuildXL.Utilities.dsc b/Public/Src/Utilities/UnitTests/Utilities/Test.BuildXL.Utilities.dsc
index 049f251bf..bce19988f 100644
--- a/Public/Src/Utilities/UnitTests/Utilities/Test.BuildXL.Utilities.dsc
+++ b/Public/Src/Utilities/UnitTests/Utilities/Test.BuildXL.Utilities.dsc
@@ -12,12 +12,17 @@ namespace Core {
         assemblyName: "Test.BuildXL.Utilities",
         allowUnsafeBlocks: true,
         sources: globR(d`.`, "*.cs"),
-        runTestArgs: {
-            // These tests require Detours to run itself, so we won't detour the test runner process itself
-            unsafeTestRunArguments: {
-                runWithUntrackedDependencies: true
-            }
-        },
+		runTestArgs: {
+			unsafeTestRunArguments: {
+				untrackedScopes: [
+					 ...addIfLazy(Context.getCurrentHost().os === "win", () => [
+						   d`${Context.getMount("ProgramFiles").path}/Git/etc/gitconfig`,
+						   d`${Context.getMount("SourceRoot").path}/.git`,
+					 ]),
+					 ...addIfLazy(!Context.isWindowsOS(), () => [d`/tmp/.dotnet/shm`])
+				]
+			},
+		},
         references: [
             importFrom("BuildXL.Cache.ContentStore").Hashing.dll,
             importFrom("BuildXL.Utilities").dll,