diff --git a/tests/Unit/Encoders/FileExtensionEncoderTest.php b/tests/Unit/Encoders/FileExtensionEncoderTest.php
index 8d111b98..4e28d9fc 100644
--- a/tests/Unit/Encoders/FileExtensionEncoderTest.php
+++ b/tests/Unit/Encoders/FileExtensionEncoderTest.php
@@ -18,13 +18,19 @@
 use Intervention\Image\FileExtension;
 use Intervention\Image\Interfaces\EncoderInterface;
 use Intervention\Image\Tests\BaseTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 final class FileExtensionEncoderTest extends BaseTestCase
 {
-    private function testEncoder(string|FileExtension $extension): EncoderInterface
+    private function testEncoder(string|FileExtension $extension, array $options = []): EncoderInterface
     {
-        $encoder = new class () extends FileExtensionEncoder
+        $encoder = new class ($extension, ...$options) extends FileExtensionEncoder
         {
+            public function __construct($mediaType, ...$options)
+            {
+                parent::__construct($mediaType, ...$options);
+            }
+
             public function test($extension)
             {
                 return $this->encoderByFileExtension($extension);
@@ -34,100 +40,56 @@ public function test($extension)
         return $encoder->test($extension);
     }
 
-    public function testEncoderByFileExtensionString(): void
-    {
-        $this->assertInstanceOf(
-            WebpEncoder::class,
-            $this->testEncoder('webp')
-        );
-
+    #[DataProvider('targetEncoderProvider')]
+    public function testEncoderByFileExtensionString(
+        string|FileExtension $fileExtension,
+        string $targetEncoderClassname,
+    ): void {
         $this->assertInstanceOf(
-            AvifEncoder::class,
-            $this->testEncoder('avif')
-        );
-
-        $this->assertInstanceOf(
-            JpegEncoder::class,
-            $this->testEncoder('jpeg')
-        );
-
-        $this->assertInstanceOf(
-            BmpEncoder::class,
-            $this->testEncoder('bmp')
-        );
-
-        $this->assertInstanceOf(
-            GifEncoder::class,
-            $this->testEncoder('gif')
-        );
-
-        $this->assertInstanceOf(
-            PngEncoder::class,
-            $this->testEncoder('png')
-        );
-
-        $this->assertInstanceOf(
-            TiffEncoder::class,
-            $this->testEncoder('tiff')
-        );
-
-        $this->assertInstanceOf(
-            Jpeg2000Encoder::class,
-            $this->testEncoder('jp2')
-        );
-
-        $this->assertInstanceOf(
-            HeicEncoder::class,
-            $this->testEncoder('heic')
+            $targetEncoderClassname,
+            $this->testEncoder($fileExtension),
         );
     }
 
-    public function testEncoderByFileExtensionEnumMember(): void
+    public static function targetEncoderProvider(): array
     {
-        $this->assertInstanceOf(
-            WebpEncoder::class,
-            $this->testEncoder(FileExtension::WEBP)
-        );
-
-        $this->assertInstanceOf(
-            AvifEncoder::class,
-            $this->testEncoder(FileExtension::AVIF)
-        );
-
-        $this->assertInstanceOf(
-            JpegEncoder::class,
-            $this->testEncoder(FileExtension::JPG)
-        );
-
-        $this->assertInstanceOf(
-            BmpEncoder::class,
-            $this->testEncoder(FileExtension::BMP)
-        );
-
-        $this->assertInstanceOf(
-            GifEncoder::class,
-            $this->testEncoder(FileExtension::GIF)
-        );
-
-        $this->assertInstanceOf(
-            PngEncoder::class,
-            $this->testEncoder(FileExtension::PNG)
-        );
-
-        $this->assertInstanceOf(
-            TiffEncoder::class,
-            $this->testEncoder(FileExtension::TIF)
-        );
+        return [
+            ['webp', WebpEncoder::class],
+            ['avif', AvifEncoder::class],
+            ['jpeg', JpegEncoder::class],
+            ['jpg', JpegEncoder::class],
+            ['bmp', BmpEncoder::class],
+            ['gif', GifEncoder::class],
+            ['png', PngEncoder::class],
+            ['tiff', TiffEncoder::class],
+            ['tif', TiffEncoder::class],
+            ['jp2', Jpeg2000Encoder::class],
+            ['heic', HeicEncoder::class],
+            [FileExtension::WEBP, WebpEncoder::class],
+            [FileExtension::AVIF, AvifEncoder::class],
+            [FileExtension::JPG, JpegEncoder::class],
+            [FileExtension::BMP, BmpEncoder::class],
+            [FileExtension::GIF, GifEncoder::class],
+            [FileExtension::PNG, PngEncoder::class],
+            [FileExtension::TIF, TiffEncoder::class],
+            [FileExtension::TIFF, TiffEncoder::class],
+            [FileExtension::JP2, Jpeg2000Encoder::class],
+            [FileExtension::HEIC, HeicEncoder::class],
+        ];
+    }
 
-        $this->assertInstanceOf(
-            Jpeg2000Encoder::class,
-            $this->testEncoder(FileExtension::JPG2)
+    public function testArgumentsNotSupportedByTargetEncoder(): void
+    {
+        $encoder = $this->testEncoder(
+            'png',
+            [
+                'interlaced' => true, // is not ignored
+                'quality' => 10, // is ignored because png encoder has no quality argument
+            ],
         );
 
-        $this->assertInstanceOf(
-            HeicEncoder::class,
-            $this->testEncoder(FileExtension::HEIC)
-        );
+        $this->assertInstanceOf(PngEncoder::class, $encoder);
+        $this->assertTrue($encoder->interlaced);
     }
 
     public function testEncoderByFileExtensionUnknown(): void
diff --git a/tests/Unit/Encoders/MediaTypeEncoderTest.php b/tests/Unit/Encoders/MediaTypeEncoderTest.php
index 0119b7ac..713611ac 100644
--- a/tests/Unit/Encoders/MediaTypeEncoderTest.php
+++ b/tests/Unit/Encoders/MediaTypeEncoderTest.php
@@ -42,7 +42,7 @@ public function test($mediaType)
 
     #[DataProvider('targetEncoderProvider')]
     public function testEncoderByMediaType(
-        string $mediaType,
+        string|MediaType $mediaType,
         string $targetEncoderClassname,
     ): void {
         $this->assertInstanceOf(
@@ -64,6 +64,16 @@ public static function targetEncoderProvider(): array
             ['image/tiff', TiffEncoder::class],
             ['image/jp2', Jpeg2000Encoder::class],
             ['image/heic', HeicEncoder::class],
+            [MediaType::IMAGE_WEBP, WebpEncoder::class],
+            [MediaType::IMAGE_AVIF, AvifEncoder::class],
+            [MediaType::IMAGE_JPEG, JpegEncoder::class],
+            [MediaType::IMAGE_BMP, BmpEncoder::class],
+            [MediaType::IMAGE_GIF, GifEncoder::class],
+            [MediaType::IMAGE_PNG, PngEncoder::class],
+            [MediaType::IMAGE_TIFF, TiffEncoder::class],
+            [MediaType::IMAGE_JP2, Jpeg2000Encoder::class],
+            [MediaType::IMAGE_HEIC, HeicEncoder::class],
+            [MediaType::IMAGE_HEIF, HeicEncoder::class],
         ];
     }