diff --git a/.editorconfig b/.editorconfig
index 8583569cfc7d..f52185c56fe6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -122,10 +122,12 @@ dotnet_diagnostic.CA1829.severity = warning
 dotnet_diagnostic.CA1830.severity = warning
 
 # CA1831: Use AsSpan or AsMemory instead of Range-based indexers when appropriate
-# CA1832: Use AsSpan or AsMemory instead of Range-based indexers when appropriate
-# CA1833: Use AsSpan or AsMemory instead of Range-based indexers when appropriate
 dotnet_diagnostic.CA1831.severity = warning
+
+# CA1832: Use AsSpan or AsMemory instead of Range-based indexers when appropriate
 dotnet_diagnostic.CA1832.severity = warning
+
+# CA1833: Use AsSpan or AsMemory instead of Range-based indexers when appropriate
 dotnet_diagnostic.CA1833.severity = warning
 
 # CA1834: Consider using 'StringBuilder.Append(char)' when applicable
@@ -225,6 +227,12 @@ dotnet_diagnostic.CA1826.severity = suggestion
 dotnet_diagnostic.CA1827.severity = suggestion
 # CA1829: Use Length/Count property instead of Count() when available
 dotnet_diagnostic.CA1829.severity = suggestion
+# CA1831: Use AsSpan or AsMemory instead of Range-based indexers when appropriate
+dotnet_diagnostic.CA1831.severity = suggestion
+# CA1832: Use AsSpan or AsMemory instead of Range-based indexers when appropriate
+dotnet_diagnostic.CA1832.severity = suggestion
+# CA1833: Use AsSpan or AsMemory instead of Range-based indexers when appropriate
+dotnet_diagnostic.CA1833.severity = suggestion
 # CA1834: Consider using 'StringBuilder.Append(char)' when applicable
 dotnet_diagnostic.CA1834.severity = suggestion
 # CA1835: Prefer the 'Memory'-based overloads for 'ReadAsync' and 'WriteAsync'
diff --git a/src/Shared/test/Shared.Tests/runtime/Http2/HPackDecoderTest.cs b/src/Shared/test/Shared.Tests/runtime/Http2/HPackDecoderTest.cs
index ac466baa1eac..9427622e6413 100644
--- a/src/Shared/test/Shared.Tests/runtime/Http2/HPackDecoderTest.cs
+++ b/src/Shared/test/Shared.Tests/runtime/Http2/HPackDecoderTest.cs
@@ -413,7 +413,7 @@ public void DecodesLiteralHeaderFieldNeverIndexed_NewName_SingleBuffer()
 
             _decoder.Decode(encoded, endHeaders: true, handler: _handler);
 
-            Assert.Equal(1, _handler.DecodedHeaders.Count);
+            Assert.Single(_handler.DecodedHeaders);
             Assert.True(_handler.DecodedHeaders.ContainsKey(_literalHeaderNameString));
             Assert.Equal(_headerValueString, _handler.DecodedHeaders[_literalHeaderNameString]);
         }
@@ -429,7 +429,7 @@ public void DecodesLiteralHeaderFieldNeverIndexed_NewName_NameLengthBrokenIntoSe
             _decoder.Decode(encoded[..1], endHeaders: false, handler: _handler);
             _decoder.Decode(encoded[1..], endHeaders: true, handler: _handler);
 
-            Assert.Equal(1, _handler.DecodedHeaders.Count);
+            Assert.Single(_handler.DecodedHeaders);
             Assert.True(_handler.DecodedHeaders.ContainsKey(_literalHeaderNameString));
             Assert.Equal(_headerValueString, _handler.DecodedHeaders[_literalHeaderNameString]);
         }
@@ -445,7 +445,7 @@ public void DecodesLiteralHeaderFieldNeverIndexed_NewName_NameBrokenIntoSeparate
             _decoder.Decode(encoded[..(_literalHeaderNameString.Length / 2)], endHeaders: false, handler: _handler);
             _decoder.Decode(encoded[(_literalHeaderNameString.Length / 2)..], endHeaders: true, handler: _handler);
 
-            Assert.Equal(1, _handler.DecodedHeaders.Count);
+            Assert.Single(_handler.DecodedHeaders);
             Assert.True(_handler.DecodedHeaders.ContainsKey(_literalHeaderNameString));
             Assert.Equal(_headerValueString, _handler.DecodedHeaders[_literalHeaderNameString]);
         }
@@ -461,7 +461,7 @@ public void DecodesLiteralHeaderFieldNeverIndexed_NewName_NameAndValueBrokenInto
             _decoder.Decode(encoded[..^_headerValue.Length], endHeaders: false, handler: _handler);
             _decoder.Decode(encoded[^_headerValue.Length..], endHeaders: true, handler: _handler);
 
-            Assert.Equal(1, _handler.DecodedHeaders.Count);
+            Assert.Single(_handler.DecodedHeaders);
             Assert.True(_handler.DecodedHeaders.ContainsKey(_literalHeaderNameString));
             Assert.Equal(_headerValueString, _handler.DecodedHeaders[_literalHeaderNameString]);
         }
@@ -477,7 +477,7 @@ public void DecodesLiteralHeaderFieldNeverIndexed_NewName_ValueLengthBrokenIntoS
             _decoder.Decode(encoded[..^(_headerValue.Length - 1)], endHeaders: false, handler: _handler);
             _decoder.Decode(encoded[^(_headerValue.Length - 1)..], endHeaders: true, handler: _handler);
 
-            Assert.Equal(1, _handler.DecodedHeaders.Count);
+            Assert.Single(_handler.DecodedHeaders);
             Assert.True(_handler.DecodedHeaders.ContainsKey(_literalHeaderNameString));
             Assert.Equal(_headerValueString, _handler.DecodedHeaders[_literalHeaderNameString]);
         }
@@ -493,7 +493,7 @@ public void DecodesLiteralHeaderFieldNeverIndexed_NewName_ValueBrokenIntoSeparat
             _decoder.Decode(encoded[..^(_headerValueString.Length / 2)], endHeaders: false, handler: _handler);
             _decoder.Decode(encoded[^(_headerValueString.Length / 2)..], endHeaders: true, handler: _handler);
 
-            Assert.Equal(1, _handler.DecodedHeaders.Count);
+            Assert.Single(_handler.DecodedHeaders);
             Assert.True(_handler.DecodedHeaders.ContainsKey(_literalHeaderNameString));
             Assert.Equal(_headerValueString, _handler.DecodedHeaders[_literalHeaderNameString]);
         }