diff --git a/test/Base64DecodingTestsUTF16.cs b/test/Base64DecodingTestsUTF16.cs
index cd05468..595f47d 100644
--- a/test/Base64DecodingTestsUTF16.cs
+++ b/test/Base64DecodingTestsUTF16.cs
@@ -54,7 +54,7 @@ public void DecodeBase64CasesScalarTUF16()
     }
 
     [Fact]
-    [Trait("Category", "SSE")]
+    [Trait("Category", "sse")]
     public void DecodeBase64CasesSSETUF16()
     {
         DecodeBase64CasesUTF16(SimdBase64.SSE.Base64.DecodeFromBase64SSE);
@@ -201,7 +201,7 @@ public void MoreDecodeTestsScalarUTF16()
 
 
     [FactOnSystemRequirementAttribute(TestSystemRequirements.X64Sse)]
-    [Trait("Category", "SSE")]
+    [Trait("Category", "sse")]
     public void MoreDecodeTestsSSEUTF16()
     {
         MoreDecodeTestsUTF16(SimdBase64.SSE.Base64.DecodeFromBase64SSE, SimdBase64.Scalar.Base64.SafeBase64ToBinaryWithWhiteSpace);
@@ -329,8 +329,9 @@ public void RoundtripBase64SSEUtf16()
         RoundtripBase64UTF16(SimdBase64.SSE.Base64.DecodeFromBase64SSE, SimdBase64.Scalar.Base64.SafeBase64ToBinaryWithWhiteSpace);
     }
 
-    [FactOnSystemRequirementAttribute(TestSystemRequirements.Arm64)]
-    [Trait("Category", "ARM64")]
+
+   [FactOnSystemRequirementAttribute(TestSystemRequirements.Arm64)]
+    [Trait("Category", "arm64")]
     public void RoundtripBase64ARMUtf16()
     {
         RoundtripBase64UTF16(SimdBase64.Arm.Base64.DecodeFromBase64ARM, SimdBase64.Scalar.Base64.SafeBase64ToBinaryWithWhiteSpace);
@@ -1541,13 +1542,12 @@ public void Issue511ScalarUTF16()
     }
 
 
-    [Trait("Category", "SSE")]
+    [Trait("Category", "sse")]
     [FactOnSystemRequirementAttribute(TestSystemRequirements.X64Sse)]
     public void Issue511SSEUTF16()
     {
         Issue511UTF16(SimdBase64.SSE.Base64.DecodeFromBase64SSE);
     }
-
     [Trait("Category", "AVX2")]
     [FactOnSystemRequirementAttribute(TestSystemRequirements.X64Sse)]
     public void Issue511AVX2UTF16()
@@ -1555,7 +1555,7 @@ public void Issue511AVX2UTF16()
         Issue511UTF16(SimdBase64.AVX2.Base64.DecodeFromBase64AVX2);
     }
 
-    [Trait("Category", "Arm64")]
+    [Trait("Category", "arm64")]
     [FactOnSystemRequirementAttribute(TestSystemRequirements.Arm64)]
     public void Issue511ARMUTF16()
     {
diff --git a/test/Base64DecodingTestsUTF8.cs b/test/Base64DecodingTestsUTF8.cs
index 2dc147e..85e850e 100644
--- a/test/Base64DecodingTestsUTF8.cs
+++ b/test/Base64DecodingTestsUTF8.cs
@@ -55,7 +55,7 @@ public void DecodeBase64CasesSSE()
         DecodeBase64CasesUTF8(SimdBase64.SSE.Base64.DecodeFromBase64SSE, SimdBase64.Scalar.Base64.MaximalBinaryLengthFromBase64Scalar);
     }
 
-    [Trait("Category", "arm")]
+    [Trait("Category", "arm64")]
     [FactOnSystemRequirementAttribute(TestSystemRequirements.Arm64)]
     public void DecodeBase64CasesARM()
     {
@@ -137,7 +137,7 @@ public void CompleteDecodeBase64CasesSSE()
         CompleteDecodeBase64CasesUTF8(SimdBase64.SSE.Base64.DecodeFromBase64SSE, SimdBase64.Scalar.Base64.SafeBase64ToBinaryWithWhiteSpace, SimdBase64.Scalar.Base64.MaximalBinaryLengthFromBase64Scalar);
     }
 
-    [Trait("Category", "arm")]
+    [Trait("Category", "arm64")]
     [FactOnSystemRequirementAttribute(TestSystemRequirements.Arm64)]
     public void CompleteDecodeBase64CasesARM()
     {
@@ -244,7 +244,7 @@ public void Issue511SSEUTF8()
         Issue511UTF8(SimdBase64.SSE.Base64.DecodeFromBase64SSE);
     }
 
-    [Trait("Category", "ARM")]
+    [Trait("Category", "arm64")]
     [FactOnSystemRequirementAttribute(TestSystemRequirements.Arm64)]
     public void Issue511ARMUTF8()
     {
@@ -327,7 +327,7 @@ public void MoreDecodeTestsUrlSSEUTF8()
         MoreDecodeTestsUrlUTF8(SimdBase64.SSE.Base64.DecodeFromBase64SSE, SimdBase64.Scalar.Base64.SafeBase64ToBinaryWithWhiteSpace, SimdBase64.Scalar.Base64.MaximalBinaryLengthFromBase64Scalar);
     }
 
-    [Trait("Category", "arm")]
+    [Trait("Category", "arm64")]
     [FactOnSystemRequirementAttribute(TestSystemRequirements.Arm64)]
     public void MoreDecodeTestsUrlARMUTF8()
     {