diff --git a/src/ImageSharp/Formats/PixelTypeInfo.cs b/src/ImageSharp/Formats/PixelTypeInfo.cs
index ed21b91bfc..c83ce67889 100644
--- a/src/ImageSharp/Formats/PixelTypeInfo.cs
+++ b/src/ImageSharp/Formats/PixelTypeInfo.cs
@@ -6,10 +6,10 @@ namespace SixLabors.ImageSharp.Formats
     /// <summary>
     /// Contains information about the pixels that make up an images visual data.
     /// </summary>
-    public class PixelTypeInfo
+    public readonly struct PixelTypeInfo
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="PixelTypeInfo"/> class.
+        /// Initializes a new instance of the <see cref="PixelTypeInfo"/> struct.
         /// </summary>
         /// <param name="bitsPerPixel">Color depth, in number of bits per pixel.</param>
         internal PixelTypeInfo(int bitsPerPixel)
diff --git a/tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs
index d958278f6e..c15b0c2b08 100644
--- a/tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs
@@ -57,7 +57,7 @@ namespace SixLabors.ImageSharp.Tests
             var testFile = TestFile.Create(imagePath);
             using (var stream = new MemoryStream(testFile.Bytes, false))
             {
-                Assert.Equal(expectedPixelSize, Image.Identify(stream)?.PixelType?.BitsPerPixel);
+                Assert.Equal(expectedPixelSize, Image.Identify(stream)?.PixelType.BitsPerPixel);
             }
         }
     }
diff --git a/tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs
index 9cdb9f8b1a..9cd29f460f 100644
--- a/tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs
@@ -172,7 +172,7 @@ namespace SixLabors.ImageSharp.Tests
             TestFile testFile = TestFile.Create(imagePath);
             using (var stream = new MemoryStream(testFile.Bytes, false))
             {
-                Assert.Equal(expectedPixelSize, Image.Identify(stream)?.PixelType?.BitsPerPixel);
+                Assert.Equal(expectedPixelSize, Image.Identify(stream)?.PixelType.BitsPerPixel);
             }
         }
 
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
index 95ee40e807..c7ac71ed92 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
@@ -397,10 +397,10 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
         [InlineData(TestImages.Jpeg.Baseline.Snake, 24)]
         public void DetectPixelSize(string imagePath, int expectedPixelSize)
         {
-            TestFile testFile = TestFile.Create(imagePath);
+            var testFile = TestFile.Create(imagePath);
             using (var stream = new MemoryStream(testFile.Bytes, false))
             {
-                Assert.Equal(expectedPixelSize, Image.Identify(stream)?.PixelType?.BitsPerPixel);
+                Assert.Equal(expectedPixelSize, Image.Identify(stream)?.PixelType.BitsPerPixel);
             }
         }
     }
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs
index f70e4e3300..8e83f5ffb7 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs
@@ -228,10 +228,10 @@ namespace SixLabors.ImageSharp.Tests
         [InlineData(TestImages.Png.Rgb48BppInterlaced, 48)]
         public void DetectPixelSize(string imagePath, int expectedPixelSize)
         {
-            TestFile testFile = TestFile.Create(imagePath);
+            var testFile = TestFile.Create(imagePath);
             using (var stream = new MemoryStream(testFile.Bytes, false))
             {
-                Assert.Equal(expectedPixelSize, Image.Identify(stream)?.PixelType?.BitsPerPixel);
+                Assert.Equal(expectedPixelSize, Image.Identify(stream)?.PixelType.BitsPerPixel);
             }
         }