3 files changed, 7 insertions, 35 deletions

diff --git a/src/test/msi/WixToolsetTest.MsiE2E/MsiE2EFixture.cs b/src/test/msi/WixToolsetTest.MsiE2E/MsiE2EFixture.cs
deleted file mode 100644
index a7646568..00000000
--- a/src/test/msi/WixToolsetTest.MsiE2E/MsiE2EFixture.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest.MsiE2E
-{
-    using System;
-    using System.Security.Principal;
-
-    public class MsiE2EFixture
-    {
-        const string RequiredEnvironmentVariableName = "RuntimeTestsEnabled";
-
-        public MsiE2EFixture()
-        {
-            using var identity = WindowsIdentity.GetCurrent();
-            var principal = new WindowsPrincipal(identity);
-            if (!principal.IsInRole(WindowsBuiltInRole.Administrator))
-            {
-                throw new InvalidOperationException("These tests must run elevated.");
-            }
-
-            var testsEnabledString = Environment.GetEnvironmentVariable(RequiredEnvironmentVariableName);
-            if (!bool.TryParse(testsEnabledString, out var testsEnabled) || !testsEnabled)
-            {
-                throw new InvalidOperationException($"These tests affect machine state. Set the {RequiredEnvironmentVariableName} environment variable to true to accept the consequences.");
-            }
-        }
-    }
-}
diff --git a/src/test/msi/WixToolsetTest.MsiE2E/MsiE2ETests.cs b/src/test/msi/WixToolsetTest.MsiE2E/MsiE2ETests.cs
index 22f2173b..ca7f15ed 100644
--- a/src/test/msi/WixToolsetTest.MsiE2E/MsiE2ETests.cs
+++ b/src/test/msi/WixToolsetTest.MsiE2E/MsiE2ETests.cs
@@ -38,7 +38,7 @@ namespace WixToolsetTest.MsiE2E
     }
 
     [CollectionDefinition("MsiE2E", DisableParallelization = true)]
-    public class MsiE2ECollectionDefinition : ICollectionFixture<MsiE2EFixture>
+    public class MsiE2ECollectionDefinition
     {
     }
 }
diff --git a/src/test/msi/WixToolsetTest.MsiE2E/UtilExtensionUserTests.cs b/src/test/msi/WixToolsetTest.MsiE2E/UtilExtensionUserTests.cs
index 21491858..fcdfde52 100644
--- a/src/test/msi/WixToolsetTest.MsiE2E/UtilExtensionUserTests.cs
+++ b/src/test/msi/WixToolsetTest.MsiE2E/UtilExtensionUserTests.cs
@@ -15,7 +15,7 @@ namespace WixToolsetTest.MsiE2E
         const string TempUsername = "USERNAME";
 
         // Verify that the users specified in the authoring are created as expected.
-        [Fact]
+        [RuntimeFact]
         public void CanInstallAndUninstallUsers()
         {
             var arguments = new string[]
@@ -49,7 +49,7 @@ namespace WixToolsetTest.MsiE2E
         }
 
         // Verify the rollback action reverts all Users changes.
-        [Fact]
+        [RuntimeFact]
         public void CanRollbackUsers()
         {
             var arguments = new string[]
@@ -74,7 +74,7 @@ namespace WixToolsetTest.MsiE2E
         }
 
         // Verify that the users specified in the authoring are created as expected on repair.
-        [Fact(Skip = "Test demonstrates failure")]
+        [RuntimeFact(Skip = "Test demonstrates failure")]
         public void CanRepairUsers()
         {
             var arguments = new string[]
@@ -113,7 +113,7 @@ namespace WixToolsetTest.MsiE2E
         }
 
         // Verify that Installation fails if FailIfExisits is set.
-        [Fact]
+        [RuntimeFact]
         public void FailsIfUserExists()
         {
             var productFailIfExists = this.CreatePackageInstaller("ProductFailIfExists");
@@ -139,7 +139,7 @@ namespace WixToolsetTest.MsiE2E
         }
 
         // Verify that a user cannot be created on a domain on which you dont have create user permission.
-        [Fact]
+        [RuntimeFact]
         public void FailsIfRestrictedDomain()
         {
             var productRestrictedDomain = this.CreatePackageInstaller("ProductRestrictedDomain");
@@ -151,7 +151,7 @@ namespace WixToolsetTest.MsiE2E
         }
 
         // Verify that adding a user to a non-existent group does not fail the install when non-vital.
-        [Fact]
+        [RuntimeFact]
         public void IgnoresMissingGroupWhenNonVital()
         {
             var productNonVitalGroup = this.CreatePackageInstaller("ProductNonVitalUserGroup");