diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/BioEnrollTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/BioEnrollTests.cs
index a74be24a..26df98f6 100644
--- a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/BioEnrollTests.cs
+++ b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/BioEnrollTests.cs
@@ -22,6 +22,7 @@
 namespace Yubico.YubiKey.Fido2
 {
     [Trait(TraitTypes.Category, TestCategories.RequiresBio)]
+    [Trait(TraitTypes.Category, TestCategories.Elevated)]
     public class BioEnrollTests : SimpleIntegrationTestConnection
     {
         // Set to 0 meaning don't cancel.
diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/ConfigTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/ConfigTests.cs
index f449e123..29201cd1 100644
--- a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/ConfigTests.cs
+++ b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/ConfigTests.cs
@@ -20,7 +20,8 @@
 
 namespace Yubico.YubiKey.Fido2
 {
-    [Trait(TraitTypes.Category, TestCategories.Simple)]
+    
+    [Trait(TraitTypes.Category, TestCategories.Elevated)]
     public class ConfigTests : SimpleIntegrationTestConnection
     {
         public ConfigTests()
diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/CredMgmtTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/CredMgmtTests.cs
index 67627cfc..cea09eba 100644
--- a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/CredMgmtTests.cs
+++ b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/CredMgmtTests.cs
@@ -21,6 +21,7 @@
 namespace Yubico.YubiKey.Fido2
 {
     [Trait(TraitTypes.Category, TestCategories.RequiresBio)]
+    [Trait(TraitTypes.Category, TestCategories.Elevated)]
     public class CredMgmtTests : IClassFixture<BioFido2Fixture>
     {
         private readonly BioFido2Fixture _bioFido2Fixture;
diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/LargeBlobTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/LargeBlobTests.cs
index 65c00549..215072d9 100644
--- a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/LargeBlobTests.cs
+++ b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/LargeBlobTests.cs
@@ -21,6 +21,7 @@
 namespace Yubico.YubiKey.Fido2
 {
     [Trait(TraitTypes.Category, TestCategories.RequiresBio)]
+    [Trait(TraitTypes.Category, TestCategories.Elevated)]
     public class LargeBlobTests
     {
         static readonly byte[] _clientDataHash = {
diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/MakeCredentialBlobTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/MakeCredentialBlobTests.cs
index 059ee4b0..cc56f6bd 100644
--- a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/MakeCredentialBlobTests.cs
+++ b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/MakeCredentialBlobTests.cs
@@ -23,6 +23,7 @@ namespace Yubico.YubiKey.Fido2
     public class MakeCredentialBlobTests
     {
         [Fact]
+        [Trait(TraitTypes.Category, TestCategories.Elevated)]
         public void CredBlobExtension_Correct()
         {
             IYubiKeyDevice yubiKeyDevice = IntegrationTestDeviceEnumeration.GetTestDevice();
diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/MakeCredentialGetAssertionTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/MakeCredentialGetAssertionTests.cs
index 44e81fdc..7a44dc94 100644
--- a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/MakeCredentialGetAssertionTests.cs
+++ b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/MakeCredentialGetAssertionTests.cs
@@ -21,6 +21,8 @@
 
 namespace Yubico.YubiKey.Fido2
 {
+    [Trait(TraitTypes.Category, TestCategories.Elevated)]
+    [Trait(TraitTypes.Category, TestCategories.RequiresTouch)]
     public class MakeCredentialGetAssertionTests
     {
         static readonly byte[] _clientDataHash = {
diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/MinPinLenTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/MinPinLenTests.cs
index 02d64f56..665c2fd6 100644
--- a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/MinPinLenTests.cs
+++ b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/MinPinLenTests.cs
@@ -20,6 +20,7 @@
 
 namespace Yubico.YubiKey.Fido2
 {
+    [Trait(TraitTypes.Category, TestCategories.Elevated)]
     public class MinPinLenTests : SimpleIntegrationTestConnection
     {
         static readonly byte[] _clientDataHash = {
@@ -42,7 +43,6 @@ public MinPinLenTests()
         }
 
         [Fact]
-        [Trait(TraitTypes.Category, TestCategories.Simple)]
         public void GetMinPinFromCredential_Succeeds()
         {
             using (var fido2Session = new Fido2Session(Device))
diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/PinCollectionTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/PinCollectionTests.cs
index 1ee47750..75a90ba0 100644
--- a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/PinCollectionTests.cs
+++ b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/PinCollectionTests.cs
@@ -25,6 +25,7 @@ public class PinCollectionTests
     {
         [Fact]
         [Trait(TraitTypes.Category, TestCategories.RequiresSetup)]
+        [Trait(TraitTypes.Category, TestCategories.Elevated)]
         public void PinOperations_Succeed()
         {
             // Assumption - the YubiKey returned has a new or reset FIDO2 application with no PIN set.
diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/VerifyFpTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/VerifyFpTests.cs
index d1532f81..9ae23e37 100644
--- a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/VerifyFpTests.cs
+++ b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/VerifyFpTests.cs
@@ -21,6 +21,7 @@
 namespace Yubico.YubiKey.Fido2
 {
     [Trait(TraitTypes.Category, TestCategories.RequiresBio)]
+    [Trait(TraitTypes.Category, TestCategories.Elevated)]
     public class VerifyFpTests : SimpleIntegrationTestConnection
     {
         public VerifyFpTests()