diff --git a/src/Shared/Traits.cs b/src/Shared/Traits.cs
index 7f0dd0ec3f6..de37c11c566 100644
--- a/src/Shared/Traits.cs
+++ b/src/Shared/Traits.cs
@@ -18,12 +18,10 @@ public static Traits Instance
         {
             get
             {
-#if DEBUG
-                if (BuildEnvironmentHelper.Instance.RunningTests && Environment.GetEnvironmentVariable("MSBUILDRELOADTRAITSONEACHACCESS") == "1")
+                if (BuildEnvironmentHelper.Instance.RunningTests)
                 {
                     return new Traits();
                 }
-#endif
                 return _instance;
             }
         }
diff --git a/src/Shared/UnitTests/TestEnvironment.cs b/src/Shared/UnitTests/TestEnvironment.cs
index 17bde2a2d92..da5464dcbfa 100644
--- a/src/Shared/UnitTests/TestEnvironment.cs
+++ b/src/Shared/UnitTests/TestEnvironment.cs
@@ -47,8 +47,6 @@ public static TestEnvironment Create(ITestOutputHelper output = null, bool ignor
                 env.WithInvariant(new BuildFailureLogInvariant());
             }
 
-            env.SetEnvironmentVariable("MSBUILDRELOADTRAITSONEACHACCESS", "1");
-
             return env;
         }