diff --git a/tests/SharpCompress.Test/GZip/GZipWriterAsyncTests.cs b/tests/SharpCompress.Test/GZip/GZipWriterAsyncTests.cs
index 60e115c0..993e1669 100644
--- a/tests/SharpCompress.Test/GZip/GZipWriterAsyncTests.cs
+++ b/tests/SharpCompress.Test/GZip/GZipWriterAsyncTests.cs
@@ -23,7 +23,7 @@ public class GZipWriterAsyncTests : WriterTests
                 FileAccess.Write
             )
         )
-        using (
+        await using (
             var writer = WriterFactory.OpenAsyncWriter(
                 new AsyncOnlyStream(stream),
                 ArchiveType.GZip,
@@ -81,7 +81,7 @@ public class GZipWriterAsyncTests : WriterTests
                 FileAccess.Write
             )
         )
-        using (var writer = new GZipWriter(new AsyncOnlyStream(stream)))
+        await using (var writer = new GZipWriter(new AsyncOnlyStream(stream)))
         {
             var path = Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar");
             await writer.WriteAsync(path, path);
diff --git a/tests/SharpCompress.Test/MarkingBinaryReaderParityTests.cs b/tests/SharpCompress.Test/MarkingBinaryReaderParityTests.cs
index 5dfeb5b8..ff4646b7 100644
--- a/tests/SharpCompress.Test/MarkingBinaryReaderParityTests.cs
+++ b/tests/SharpCompress.Test/MarkingBinaryReaderParityTests.cs
@@ -26,7 +26,7 @@ public class MarkingBinaryReaderParityTests : TestBase
     public void Mark_Resets_ByteCount()
     {
         using var stream = new MemoryStream(_testData);
-        var reader = new MarkingBinaryReader(stream);
+        using var reader = new MarkingBinaryReader(stream);
 
         reader.ReadBytes(10);
         Assert.Equal(10, reader.CurrentReadByteCount);
@@ -58,7 +58,7 @@ public class MarkingBinaryReaderParityTests : TestBase
     public void ReadByte_Updates_ByteCount()
     {
         using var stream = new MemoryStream(_testData);
-        var reader = new MarkingBinaryReader(stream);
+        using var reader = new MarkingBinaryReader(stream);
 
         reader.Mark();
         reader.ReadByte();
@@ -86,7 +86,7 @@ public class MarkingBinaryReaderParityTests : TestBase
     public void ReadBytes_Updates_ByteCount()
     {
         using var stream = new MemoryStream(_testData);
-        var reader = new MarkingBinaryReader(stream);
+        using var reader = new MarkingBinaryReader(stream);
 
         reader.Mark();
         reader.ReadBytes(16);
@@ -114,7 +114,7 @@ public class MarkingBinaryReaderParityTests : TestBase
     public void ReadUInt16_Updates_ByteCount()
     {
         using var stream = new MemoryStream(_testData);
-        var reader = new MarkingBinaryReader(stream);
+        using var reader = new MarkingBinaryReader(stream);
 
         reader.Mark();
         reader.ReadUInt16();
@@ -136,7 +136,7 @@ public class MarkingBinaryReaderParityTests : TestBase
     public void ReadUInt32_Updates_ByteCount()
     {
         using var stream = new MemoryStream(_testData);
-        var reader = new MarkingBinaryReader(stream);
+        using var reader = new MarkingBinaryReader(stream);
 
         reader.Mark();
         reader.ReadUInt32();
@@ -160,7 +160,7 @@ public class MarkingBinaryReaderParityTests : TestBase
         // Create valid RAR v-int data: 0x05 (value 5, no continuation bit)
         var data = new byte[] { 0x05, 0x85, 0x01, 0x00 }; // 0x05, then 0x85 0x01 (value 5 + 128 = 133)
         using var stream = new MemoryStream(data);
-        var reader = new MarkingBinaryReader(stream);
+        using var reader = new MarkingBinaryReader(stream);
 
         reader.Mark();
         // Read a single-byte v-int (value 5, no continuation bit)
@@ -197,7 +197,7 @@ public class MarkingBinaryReaderParityTests : TestBase
     {
         using var syncStream = new MemoryStream(_testData);
         using var asyncStream = new MemoryStream(_testData);
-        var syncReader = new MarkingBinaryReader(syncStream);
+        using var syncReader = new MarkingBinaryReader(syncStream);
         var asyncReader = new AsyncMarkingBinaryReader(asyncStream);
 
         syncReader.Mark();
@@ -229,7 +229,7 @@ public class MarkingBinaryReaderParityTests : TestBase
     {
         using var syncStream = new MemoryStream(_testData);
         using var asyncStream = new MemoryStream(_testData);
-        var syncReader = new MarkingBinaryReader(syncStream);
+        using var syncReader = new MarkingBinaryReader(syncStream);
         var asyncReader = new AsyncMarkingBinaryReader(asyncStream);
 
         syncReader.Mark();
diff --git a/tests/SharpCompress.Test/Tar/TarArchiveAsyncTests.cs b/tests/SharpCompress.Test/Tar/TarArchiveAsyncTests.cs
index 194a07d8..78b851f7 100644
--- a/tests/SharpCompress.Test/Tar/TarArchiveAsyncTests.cs
+++ b/tests/SharpCompress.Test/Tar/TarArchiveAsyncTests.cs
@@ -43,9 +43,11 @@ public class TarArchiveAsyncTests : ArchiveTests
             )
             using (Stream inputStream = new MemoryStream())
             {
-                var sw = new StreamWriter(inputStream);
-                await sw.WriteAsync("dummy filecontent");
-                await sw.FlushAsync();
+                using (var sw = new StreamWriter(inputStream))
+                {
+                    await sw.WriteAsync("dummy filecontent");
+                    await sw.FlushAsync();
+                }
 
                 inputStream.Position = 0;
                 await writer.WriteAsync(filename, inputStream, null);
@@ -69,10 +71,10 @@ public class TarArchiveAsyncTests : ArchiveTests
 
             await foreach (var entry in archive2.EntriesAsync)
             {
-                Assert.Equal(
-                    "dummy filecontent",
-                    await new StreamReader(await entry.OpenEntryStreamAsync()).ReadLineAsync()
-                );
+                using (var sr = new StreamReader(await entry.OpenEntryStreamAsync()))
+                {
+                    Assert.Equal("dummy filecontent", await sr.ReadLineAsync());
+                }
             }
         }
     }
@@ -102,9 +104,11 @@ public class TarArchiveAsyncTests : ArchiveTests
         )
         using (Stream inputStream = new MemoryStream())
         {
-            var sw = new StreamWriter(inputStream);
-            await sw.WriteAsync("dummy filecontent");
-            await sw.FlushAsync();
+            using (var sw = new StreamWriter(inputStream))
+            {
+                await sw.WriteAsync("dummy filecontent");
+                await sw.FlushAsync();
+            }
 
             inputStream.Position = 0;
             await writer.WriteAsync(longFilename, inputStream, null);
@@ -127,10 +131,10 @@ public class TarArchiveAsyncTests : ArchiveTests
 
             await foreach (var entry in archive2.EntriesAsync)
             {
-                Assert.Equal(
-                    "dummy filecontent",
-                    await new StreamReader(await entry.OpenEntryStreamAsync()).ReadLineAsync()
-                );
+                using (var sr = new StreamReader(await entry.OpenEntryStreamAsync()))
+                {
+                    Assert.Equal("dummy filecontent", await sr.ReadLineAsync());
+                }
             }
         }
 #if LEGACY_DOTNET
diff --git a/tests/SharpCompress.Test/Tar/TarArchiveTests.cs b/tests/SharpCompress.Test/Tar/TarArchiveTests.cs
index 488e3914..ab399231 100644
--- a/tests/SharpCompress.Test/Tar/TarArchiveTests.cs
+++ b/tests/SharpCompress.Test/Tar/TarArchiveTests.cs
@@ -54,9 +54,11 @@ public class TarArchiveTests : ArchiveTests
         )
         using (Stream inputStream = new MemoryStream())
         {
-            var sw = new StreamWriter(inputStream);
-            sw.Write("dummy filecontent");
-            sw.Flush();
+            using (var sw = new StreamWriter(inputStream))
+            {
+                sw.Write("dummy filecontent");
+                sw.Flush();
+            }
 
             inputStream.Position = 0;
             writer.Write(filename, inputStream, null);
@@ -71,10 +73,10 @@ public class TarArchiveTests : ArchiveTests
 
             foreach (var entry in archive2.Entries)
             {
-                Assert.Equal(
-                    "dummy filecontent",
-                    new StreamReader(entry.OpenEntryStream()).ReadLine()
-                );
+                using (var sr = new StreamReader(entry.OpenEntryStream()))
+                {
+                    Assert.Equal("dummy filecontent", sr.ReadLine());
+                }
             }
         }
     }
@@ -120,9 +122,11 @@ public class TarArchiveTests : ArchiveTests
         )
         using (Stream inputStream = new MemoryStream())
         {
-            var sw = new StreamWriter(inputStream);
-            sw.Write("dummy filecontent");
-            sw.Flush();
+            using (var sw = new StreamWriter(inputStream))
+            {
+                sw.Write("dummy filecontent");
+                sw.Flush();
+            }
 
             inputStream.Position = 0;
             writer.Write(longFilename, inputStream, null);
@@ -137,10 +141,10 @@ public class TarArchiveTests : ArchiveTests
 
             foreach (var entry in archive2.Entries)
             {
-                Assert.Equal(
-                    "dummy filecontent",
-                    new StreamReader(entry.OpenEntryStream()).ReadLine()
-                );
+                using (var sr = new StreamReader(entry.OpenEntryStream()))
+                {
+                    Assert.Equal("dummy filecontent", sr.ReadLine());
+                }
             }
         }
     }
diff --git a/tests/SharpCompress.Test/Xz/XZBlockAsyncTests.cs b/tests/SharpCompress.Test/Xz/XZBlockAsyncTests.cs
index bff4d7c3..6460ed53 100644
--- a/tests/SharpCompress.Test/Xz/XZBlockAsyncTests.cs
+++ b/tests/SharpCompress.Test/Xz/XZBlockAsyncTests.cs
@@ -30,7 +30,7 @@ public class XzBlockAsyncTests : XzTestsBase
     {
         var bytes = new byte[] { 0 };
         using Stream indexBlockStream = new MemoryStream(bytes);
-        var xzBlock = new XZBlock(indexBlockStream, CheckType.CRC64, 8);
+        using var xzBlock = new XZBlock(indexBlockStream, CheckType.CRC64, 8);
         await Assert.ThrowsAsync<XZIndexMarkerReachedException>(async () =>
         {
             await ReadBytesAsync(xzBlock, 1).ConfigureAwait(false);
@@ -44,7 +44,7 @@ public class XzBlockAsyncTests : XzTestsBase
         bytes[20]++;
         using Stream badCrcStream = new MemoryStream(bytes);
         Rewind(badCrcStream);
-        var xzBlock = new XZBlock(badCrcStream, CheckType.CRC64, 8);
+        using var xzBlock = new XZBlock(badCrcStream, CheckType.CRC64, 8);
         var ex = await Assert.ThrowsAsync<InvalidFormatException>(async () =>
         {
             await ReadBytesAsync(xzBlock, 1).ConfigureAwait(false);
@@ -55,7 +55,7 @@ public class XzBlockAsyncTests : XzTestsBase
     [Fact]
     public async ValueTask CanReadMAsync()
     {
-        var xzBlock = new XZBlock(CompressedStream, CheckType.CRC64, 8);
+        using var xzBlock = new XZBlock(CompressedStream, CheckType.CRC64, 8);
         Assert.Equal(
             Encoding.ASCII.GetBytes("M"),
             await ReadBytesAsync(xzBlock, 1).ConfigureAwait(false)
@@ -65,7 +65,7 @@ public class XzBlockAsyncTests : XzTestsBase
     [Fact]
     public async ValueTask CanReadMaryAsync()
     {
-        var xzBlock = new XZBlock(CompressedStream, CheckType.CRC64, 8);
+        using var xzBlock = new XZBlock(CompressedStream, CheckType.CRC64, 8);
         Assert.Equal(
             Encoding.ASCII.GetBytes("M"),
             await ReadBytesAsync(xzBlock, 1).ConfigureAwait(false)
@@ -83,8 +83,8 @@ public class XzBlockAsyncTests : XzTestsBase
     [Fact]
     public async ValueTask CanReadPoemWithStreamReaderAsync()
     {
-        var xzBlock = new XZBlock(CompressedStream, CheckType.CRC64, 8);
-        var sr = new StreamReader(xzBlock);
+        using var xzBlock = new XZBlock(CompressedStream, CheckType.CRC64, 8);
+        using var sr = new StreamReader(xzBlock);
         Assert.Equal(await sr.ReadToEndAsync().ConfigureAwait(false), Original);
     }
 
@@ -92,8 +92,8 @@ public class XzBlockAsyncTests : XzTestsBase
     public async ValueTask NoopWhenNoPaddingAsync()
     {
         // CompressedStream's only block has no padding.
-        var xzBlock = new XZBlock(CompressedStream, CheckType.CRC64, 8);
-        var sr = new StreamReader(xzBlock);
+        using var xzBlock = new XZBlock(CompressedStream, CheckType.CRC64, 8);
+        using var sr = new StreamReader(xzBlock);
         await sr.ReadToEndAsync().ConfigureAwait(false);
         Assert.Equal(0L, CompressedStream.Position % 4L);
     }
@@ -102,8 +102,8 @@ public class XzBlockAsyncTests : XzTestsBase
     public async ValueTask SkipsPaddingWhenPresentAsync()
     {
         // CompressedIndexedStream's first block has 1-byte padding.
-        var xzBlock = new XZBlock(CompressedIndexedStream, CheckType.CRC64, 8);
-        var sr = new StreamReader(xzBlock);
+        using var xzBlock = new XZBlock(CompressedIndexedStream, CheckType.CRC64, 8);
+        using var sr = new StreamReader(xzBlock);
         await sr.ReadToEndAsync().ConfigureAwait(false);
         Assert.Equal(0L, CompressedIndexedStream.Position % 4L);
     }
@@ -117,8 +117,8 @@ public class XzBlockAsyncTests : XzTestsBase
         compressedUnalignedStream.Position = 13;
 
         // Compressed's only block has no padding.
-        var xzBlock = new XZBlock(compressedUnalignedStream, CheckType.CRC64, 8);
-        var sr = new StreamReader(xzBlock);
+        using var xzBlock = new XZBlock(compressedUnalignedStream, CheckType.CRC64, 8);
+        using var sr = new StreamReader(xzBlock);
         await sr.ReadToEndAsync().ConfigureAwait(false);
         Assert.Equal(1L, compressedUnalignedStream.Position % 4L);
     }
diff --git a/tests/SharpCompress.Test/Xz/XZBlockTests.cs b/tests/SharpCompress.Test/Xz/XZBlockTests.cs
index 44245075..3b06008e 100644
--- a/tests/SharpCompress.Test/Xz/XZBlockTests.cs
+++ b/tests/SharpCompress.Test/Xz/XZBlockTests.cs
@@ -29,7 +29,7 @@ public class XzBlockTests : XzTestsBase
     {
         var bytes = new byte[] { 0 };
         using Stream indexBlockStream = new MemoryStream(bytes);
-        var xzBlock = new XZBlock(indexBlockStream, CheckType.CRC64, 8);
+        using var xzBlock = new XZBlock(indexBlockStream, CheckType.CRC64, 8);
         Assert.Throws<XZIndexMarkerReachedException>(() =>
         {
             ReadBytes(xzBlock, 1);
@@ -43,7 +43,7 @@ public class XzBlockTests : XzTestsBase
         bytes[20]++;
         using Stream badCrcStream = new MemoryStream(bytes);
         Rewind(badCrcStream);
-        var xzBlock = new XZBlock(badCrcStream, CheckType.CRC64, 8);
+        using var xzBlock = new XZBlock(badCrcStream, CheckType.CRC64, 8);
         var ex = Assert.Throws<InvalidFormatException>(() =>
         {
             ReadBytes(xzBlock, 1);
@@ -54,14 +54,14 @@ public class XzBlockTests : XzTestsBase
     [Fact]
     public void CanReadM()
     {
-        var xzBlock = new XZBlock(CompressedStream, CheckType.CRC64, 8);
+        using var xzBlock = new XZBlock(CompressedStream, CheckType.CRC64, 8);
         Assert.Equal(Encoding.ASCII.GetBytes("M"), ReadBytes(xzBlock, 1));
     }
 
     [Fact]
     public void CanReadMary()
     {
-        var xzBlock = new XZBlock(CompressedStream, CheckType.CRC64, 8);
+        using var xzBlock = new XZBlock(CompressedStream, CheckType.CRC64, 8);
         Assert.Equal(Encoding.ASCII.GetBytes("M"), ReadBytes(xzBlock, 1));
         Assert.Equal(Encoding.ASCII.GetBytes("a"), ReadBytes(xzBlock, 1));
         Assert.Equal(Encoding.ASCII.GetBytes("ry"), ReadBytes(xzBlock, 2));
@@ -71,7 +71,7 @@ public class XzBlockTests : XzTestsBase
     public void CanReadPoemWithStreamReader()
     {
         var xzBlock = new XZBlock(CompressedStream, CheckType.CRC64, 8);
-        var sr = new StreamReader(xzBlock);
+        using var sr = new StreamReader(xzBlock);
         Assert.Equal(sr.ReadToEnd(), Original);
     }
 
@@ -79,8 +79,8 @@ public class XzBlockTests : XzTestsBase
     public void NoopWhenNoPadding()
     {
         // CompressedStream's only block has no padding.
-        var xzBlock = new XZBlock(CompressedStream, CheckType.CRC64, 8);
-        var sr = new StreamReader(xzBlock);
+        using var xzBlock = new XZBlock(CompressedStream, CheckType.CRC64, 8);
+        using var sr = new StreamReader(xzBlock);
         sr.ReadToEnd();
         Assert.Equal(0L, CompressedStream.Position % 4L);
     }
@@ -89,8 +89,8 @@ public class XzBlockTests : XzTestsBase
     public void SkipsPaddingWhenPresent()
     {
         // CompressedIndexedStream's first block has 1-byte padding.
-        var xzBlock = new XZBlock(CompressedIndexedStream, CheckType.CRC64, 8);
-        var sr = new StreamReader(xzBlock);
+        using var xzBlock = new XZBlock(CompressedIndexedStream, CheckType.CRC64, 8);
+        using var sr = new StreamReader(xzBlock);
         sr.ReadToEnd();
         Assert.Equal(0L, CompressedIndexedStream.Position % 4L);
     }
@@ -104,8 +104,8 @@ public class XzBlockTests : XzTestsBase
         compressedUnalignedStream.Position = 13;
 
         // Compressed's only block has no padding.
-        var xzBlock = new XZBlock(compressedUnalignedStream, CheckType.CRC64, 8);
-        var sr = new StreamReader(xzBlock);
+        using var xzBlock = new XZBlock(compressedUnalignedStream, CheckType.CRC64, 8);
+        using var sr = new StreamReader(xzBlock);
         sr.ReadToEnd();
         Assert.Equal(1L, compressedUnalignedStream.Position % 4L);
     }
diff --git a/tests/SharpCompress.Test/Xz/XZHeaderAsyncTests.cs b/tests/SharpCompress.Test/Xz/XZHeaderAsyncTests.cs
index 74fb94c0..61296b91 100644
--- a/tests/SharpCompress.Test/Xz/XZHeaderAsyncTests.cs
+++ b/tests/SharpCompress.Test/Xz/XZHeaderAsyncTests.cs
@@ -14,7 +14,7 @@ public class XzHeaderAsyncTests : XzTestsBase
         var bytes = (byte[])Compressed.Clone();
         bytes[3]++;
         using Stream badMagicNumberStream = new MemoryStream(bytes);
-        var br = new BinaryReader(badMagicNumberStream);
+        using var br = new BinaryReader(badMagicNumberStream);
         var header = new XZHeader(br);
         var ex = await Assert.ThrowsAsync<InvalidFormatException>(async () =>
         {
@@ -29,7 +29,7 @@ public class XzHeaderAsyncTests : XzTestsBase
         var bytes = (byte[])Compressed.Clone();
         bytes[8]++;
         using Stream badCrcStream = new MemoryStream(bytes);
-        var br = new BinaryReader(badCrcStream);
+        using var br = new BinaryReader(badCrcStream);
         var header = new XZHeader(br);
         var ex = await Assert.ThrowsAsync<InvalidFormatException>(async () =>
         {
@@ -47,7 +47,7 @@ public class XzHeaderAsyncTests : XzTestsBase
         streamFlags.CopyTo(bytes, 6);
         crc.CopyTo(bytes, 8);
         using Stream badFlagStream = new MemoryStream(bytes);
-        var br = new BinaryReader(badFlagStream);
+        using var br = new BinaryReader(badFlagStream);
         var header = new XZHeader(br);
         var ex = await Assert.ThrowsAsync<InvalidFormatException>(async () =>
         {
@@ -59,7 +59,7 @@ public class XzHeaderAsyncTests : XzTestsBase
     [Fact]
     public async ValueTask ProcessesBlockCheckTypeAsync()
     {
-        var br = new BinaryReader(CompressedStream);
+        using var br = new BinaryReader(CompressedStream);
         var header = new XZHeader(br);
         await header.ProcessAsync().ConfigureAwait(false);
         Assert.Equal(CheckType.CRC64, header.BlockCheckType);
@@ -68,7 +68,7 @@ public class XzHeaderAsyncTests : XzTestsBase
     [Fact]
     public async ValueTask CanCalculateBlockCheckSizeAsync()
     {
-        var br = new BinaryReader(CompressedStream);
+        using var br = new BinaryReader(CompressedStream);
         var header = new XZHeader(br);
         await header.ProcessAsync().ConfigureAwait(false);
         Assert.Equal(8, header.BlockCheckSize);
diff --git a/tests/SharpCompress.Test/Xz/XZHeaderTests.cs b/tests/SharpCompress.Test/Xz/XZHeaderTests.cs
index c8f3ac5e..ab9bd315 100644
--- a/tests/SharpCompress.Test/Xz/XZHeaderTests.cs
+++ b/tests/SharpCompress.Test/Xz/XZHeaderTests.cs
@@ -13,7 +13,7 @@ public class XzHeaderTests : XzTestsBase
         var bytes = (byte[])Compressed.Clone();
         bytes[3]++;
         using Stream badMagicNumberStream = new MemoryStream(bytes);
-        var br = new BinaryReader(badMagicNumberStream);
+        using var br = new BinaryReader(badMagicNumberStream);
         var header = new XZHeader(br);
         var ex = Assert.Throws<InvalidFormatException>(() =>
         {
@@ -28,7 +28,7 @@ public class XzHeaderTests : XzTestsBase
         var bytes = (byte[])Compressed.Clone();
         bytes[8]++;
         using Stream badCrcStream = new MemoryStream(bytes);
-        var br = new BinaryReader(badCrcStream);
+        using var br = new BinaryReader(badCrcStream);
         var header = new XZHeader(br);
         var ex = Assert.Throws<InvalidFormatException>(() =>
         {
@@ -46,7 +46,7 @@ public class XzHeaderTests : XzTestsBase
         streamFlags.CopyTo(bytes, 6);
         crc.CopyTo(bytes, 8);
         using Stream badFlagStream = new MemoryStream(bytes);
-        var br = new BinaryReader(badFlagStream);
+        using var br = new BinaryReader(badFlagStream);
         var header = new XZHeader(br);
         var ex = Assert.Throws<InvalidFormatException>(() =>
         {
@@ -58,7 +58,7 @@ public class XzHeaderTests : XzTestsBase
     [Fact]
     public void ProcessesBlockCheckType()
     {
-        var br = new BinaryReader(CompressedStream);
+        using var br = new BinaryReader(CompressedStream);
         var header = new XZHeader(br);
         header.Process();
         Assert.Equal(CheckType.CRC64, header.BlockCheckType);
@@ -67,7 +67,7 @@ public class XzHeaderTests : XzTestsBase
     [Fact]
     public void CanCalculateBlockCheckSize()
     {
-        var br = new BinaryReader(CompressedStream);
+        using var br = new BinaryReader(CompressedStream);
         var header = new XZHeader(br);
         header.Process();
         Assert.Equal(8, header.BlockCheckSize);
diff --git a/tests/SharpCompress.Test/Xz/XZIndexAsyncTests.cs b/tests/SharpCompress.Test/Xz/XZIndexAsyncTests.cs
index 02a96e9b..b740ddcd 100644
--- a/tests/SharpCompress.Test/Xz/XZIndexAsyncTests.cs
+++ b/tests/SharpCompress.Test/Xz/XZIndexAsyncTests.cs
@@ -18,7 +18,7 @@ public class XzIndexAsyncTests : XzTestsBase
     public void RecordsStreamStartOnInit()
     {
         using Stream badStream = new MemoryStream([1, 2, 3, 4, 5]);
-        var br = new BinaryReader(badStream);
+        using var br = new BinaryReader(badStream);
         var index = new XZIndex(br, false);
         Assert.Equal(0, index.StreamStartPosition);
     }
@@ -27,7 +27,7 @@ public class XzIndexAsyncTests : XzTestsBase
     public async ValueTask ThrowsIfHasNoIndexMarkerAsync()
     {
         using Stream badStream = new MemoryStream([1, 2, 3, 4, 5]);
-        var br = new BinaryReader(badStream);
+        using var br = new BinaryReader(badStream);
         var index = new XZIndex(br, false);
         await Assert.ThrowsAsync<InvalidFormatException>(async () =>
             await index.ProcessAsync().ConfigureAwait(false)
@@ -37,7 +37,7 @@ public class XzIndexAsyncTests : XzTestsBase
     [Fact]
     public async ValueTask ReadsNoRecordAsync()
     {
-        var br = new BinaryReader(CompressedEmptyStream);
+        using var br = new BinaryReader(CompressedEmptyStream);
         var index = new XZIndex(br, false);
         await index.ProcessAsync().ConfigureAwait(false);
         Assert.Equal((ulong)0, index.NumberOfRecords);
@@ -46,7 +46,7 @@ public class XzIndexAsyncTests : XzTestsBase
     [Fact]
     public async ValueTask ReadsOneRecordAsync()
     {
-        var br = new BinaryReader(CompressedStream);
+        using var br = new BinaryReader(CompressedStream);
         var index = new XZIndex(br, false);
         await index.ProcessAsync().ConfigureAwait(false);
         Assert.Equal((ulong)1, index.NumberOfRecords);
@@ -55,7 +55,7 @@ public class XzIndexAsyncTests : XzTestsBase
     [Fact]
     public async ValueTask ReadsMultipleRecordsAsync()
     {
-        var br = new BinaryReader(CompressedIndexedStream);
+        using var br = new BinaryReader(CompressedIndexedStream);
         var index = new XZIndex(br, false);
         await index.ProcessAsync().ConfigureAwait(false);
         Assert.Equal((ulong)2, index.NumberOfRecords);
@@ -64,7 +64,7 @@ public class XzIndexAsyncTests : XzTestsBase
     [Fact]
     public async ValueTask ReadsFirstRecordAsync()
     {
-        var br = new BinaryReader(CompressedStream);
+        using var br = new BinaryReader(CompressedStream);
         var index = new XZIndex(br, false);
         await index.ProcessAsync().ConfigureAwait(false);
         Assert.Equal((ulong)OriginalBytes.Length, index.Records[0].UncompressedSize);
@@ -89,7 +89,7 @@ public class XzIndexAsyncTests : XzTestsBase
             0xC9,
             0xFF,
         ]);
-        var br = new BinaryReader(badStream);
+        using var br = new BinaryReader(badStream);
         var index = new XZIndex(br, false);
         await index.ProcessAsync().ConfigureAwait(false);
         Assert.Equal(0L, badStream.Position % 4L);
diff --git a/tests/SharpCompress.Test/Xz/XZIndexTests.cs b/tests/SharpCompress.Test/Xz/XZIndexTests.cs
index 6930e869..022dcd97 100644
--- a/tests/SharpCompress.Test/Xz/XZIndexTests.cs
+++ b/tests/SharpCompress.Test/Xz/XZIndexTests.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using SharpCompress.Common;
 using SharpCompress.Compressors.Xz;
 using Xunit;
@@ -17,7 +17,7 @@ public class XzIndexTests : XzTestsBase
     public void RecordsStreamStartOnInit()
     {
         using Stream badStream = new MemoryStream([1, 2, 3, 4, 5]);
-        var br = new BinaryReader(badStream);
+        using var br = new BinaryReader(badStream);
         var index = new XZIndex(br, false);
         Assert.Equal(0, index.StreamStartPosition);
     }
@@ -26,7 +26,7 @@ public class XzIndexTests : XzTestsBase
     public void ThrowsIfHasNoIndexMarker()
     {
         using Stream badStream = new MemoryStream([1, 2, 3, 4, 5]);
-        var br = new BinaryReader(badStream);
+        using var br = new BinaryReader(badStream);
         var index = new XZIndex(br, false);
         Assert.Throws<InvalidFormatException>(() => index.Process());
     }
@@ -34,7 +34,7 @@ public class XzIndexTests : XzTestsBase
     [Fact]
     public void ReadsNoRecord()
     {
-        var br = new BinaryReader(CompressedEmptyStream);
+        using var br = new BinaryReader(CompressedEmptyStream);
         var index = new XZIndex(br, false);
         index.Process();
         Assert.Equal((ulong)0, index.NumberOfRecords);
@@ -43,7 +43,7 @@ public class XzIndexTests : XzTestsBase
     [Fact]
     public void ReadsOneRecord()
     {
-        var br = new BinaryReader(CompressedStream);
+        using var br = new BinaryReader(CompressedStream);
         var index = new XZIndex(br, false);
         index.Process();
         Assert.Equal((ulong)1, index.NumberOfRecords);
@@ -52,7 +52,7 @@ public class XzIndexTests : XzTestsBase
     [Fact]
     public void ReadsMultipleRecords()
     {
-        var br = new BinaryReader(CompressedIndexedStream);
+        using var br = new BinaryReader(CompressedIndexedStream);
         var index = new XZIndex(br, false);
         index.Process();
         Assert.Equal((ulong)2, index.NumberOfRecords);
@@ -61,7 +61,7 @@ public class XzIndexTests : XzTestsBase
     [Fact]
     public void ReadsFirstRecord()
     {
-        var br = new BinaryReader(CompressedStream);
+        using var br = new BinaryReader(CompressedStream);
         var index = new XZIndex(br, false);
         index.Process();
         Assert.Equal((ulong)OriginalBytes.Length, index.Records[0].UncompressedSize);
@@ -86,7 +86,7 @@ public class XzIndexTests : XzTestsBase
             0xC9,
             0xFF,
         ]);
-        var br = new BinaryReader(badStream);
+        using var br = new BinaryReader(badStream);
         var index = new XZIndex(br, false);
         index.Process();
         Assert.Equal(0L, badStream.Position % 4L);
diff --git a/tests/SharpCompress.Test/Xz/XZStreamAsyncTests.cs b/tests/SharpCompress.Test/Xz/XZStreamAsyncTests.cs
index a2276602..7287983a 100644
--- a/tests/SharpCompress.Test/Xz/XZStreamAsyncTests.cs
+++ b/tests/SharpCompress.Test/Xz/XZStreamAsyncTests.cs
@@ -11,7 +11,7 @@ public class XzStreamAsyncTests : XzTestsBase
     [Fact]
     public async ValueTask CanReadEmptyStreamAsync()
     {
-        var xz = new XZStream(CompressedEmptyStream);
+        using var xz = new XZStream(CompressedEmptyStream);
         using var sr = new StreamReader(new AsyncOnlyStream(xz));
         var uncompressed = await sr.ReadToEndAsync().ConfigureAwait(false);
         Assert.Equal(OriginalEmpty, uncompressed);
@@ -20,7 +20,7 @@ public class XzStreamAsyncTests : XzTestsBase
     [Fact]
     public async ValueTask CanReadStreamAsync()
     {
-        var xz = new XZStream(CompressedStream);
+        using var xz = new XZStream(CompressedStream);
         using var sr = new StreamReader(new AsyncOnlyStream(xz));
         var uncompressed = await sr.ReadToEndAsync().ConfigureAwait(false);
         Assert.Equal(Original, uncompressed);
@@ -29,7 +29,7 @@ public class XzStreamAsyncTests : XzTestsBase
     [Fact]
     public async ValueTask CanReadIndexedStreamAsync()
     {
-        var xz = new XZStream(CompressedIndexedStream);
+        using var xz = new XZStream(CompressedIndexedStream);
         using var sr = new StreamReader(new AsyncOnlyStream(xz));
         var uncompressed = await sr.ReadToEndAsync().ConfigureAwait(false);
         Assert.Equal(OriginalIndexed, uncompressed);
diff --git a/tests/SharpCompress.Test/Zip/Zip64AsyncTests.cs b/tests/SharpCompress.Test/Zip/Zip64AsyncTests.cs
index 7e1b143a..48b29ff4 100644
--- a/tests/SharpCompress.Test/Zip/Zip64AsyncTests.cs
+++ b/tests/SharpCompress.Test/Zip/Zip64AsyncTests.cs
@@ -199,33 +199,30 @@ public class Zip64AsyncTests : WriterTests
         ZipEntry? prev = null;
         using (var fs = File.OpenRead(filename))
         {
-            var rd = await ReaderFactory.OpenAsyncReader(
+            await using var rd = await ReaderFactory.OpenAsyncReader(
                 new AsyncOnlyStream(fs),
                 new ReaderOptions { LookForHeader = false }
             );
-            await using (rd)
+            while (await rd.MoveToNextEntryAsync())
             {
-                while (await rd.MoveToNextEntryAsync())
-                {
 #if LEGACY_DOTNET
-                    using (var entryStream = await rd.OpenEntryStreamAsync())
-                    {
-                        await entryStream.SkipEntryAsync();
-                    }
-#else
-                    await using (var entryStream = await rd.OpenEntryStreamAsync())
-                    {
-                        await entryStream.SkipEntryAsync();
-                    }
-#endif
-                    count++;
-                    if (prev != null)
-                    {
-                        size += prev.Size;
-                    }
-
-                    prev = (ZipEntry)rd.Entry;
+                using (var entryStream = await rd.OpenEntryStreamAsync())
+                {
+                    await entryStream.SkipEntryAsync();
                 }
+#else
+                await using (var entryStream = await rd.OpenEntryStreamAsync())
+                {
+                    await entryStream.SkipEntryAsync();
+                }
+#endif
+                count++;
+                if (prev != null)
+                {
+                    size += prev.Size;
+                }
+
+                prev = (ZipEntry)rd.Entry;
             }
         }