diff --git a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/CmykColorConversion.cs b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/CmykColorConversion.cs
index 2642c21f12..36e6669578 100644
--- a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/CmykColorConversion.cs
+++ b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/CmykColorConversion.cs
@@ -19,7 +19,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
         {
             var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
 
-            new JpegColorConverterBase.FromCmykBasic(8).ConvertToRgbInplace(values);
+            new JpegColorConverterBase.FromCmykScalar(8).ConvertToRgbInplace(values);
         }
 
         [Benchmark]
@@ -30,12 +30,14 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
             new JpegColorConverterBase.FromCmykVector8(8).ConvertToRgbInplace(values);
         }
 
+#if SUPPORTS_RUNTIME_INTRINSICS
         [Benchmark]
-        public void SimdVectorAvx2()
+        public void SimdVectorAvx()
         {
             var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
 
-            new JpegColorConverterBase.FromCmykAvx2(8).ConvertToRgbInplace(values);
+            new JpegColorConverterBase.FromCmykAvx(8).ConvertToRgbInplace(values);
         }
+#endif
     }
 }
diff --git a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/GrayscaleColorConversion.cs b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/GrayscaleColorConversion.cs
index 1fc85e967a..2fdb47077d 100644
--- a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/GrayscaleColorConversion.cs
+++ b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/GrayscaleColorConversion.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using BenchmarkDotNet.Attributes;
@@ -19,15 +19,17 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
         {
             var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
 
-            new JpegColorConverterBase.FromGrayscaleBasic(8).ConvertToRgbInplace(values);
+            new JpegColorConverterBase.FromGrayscaleScalar(8).ConvertToRgbInplace(values);
         }
 
+#if SUPPORTS_RUNTIME_INTRINSICS
         [Benchmark]
-        public void SimdVectorAvx2()
+        public void SimdVectorAvx()
         {
             var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
 
-            new JpegColorConverterBase.FromGrayscaleAvx2(8).ConvertToRgbInplace(values);
+            new JpegColorConverterBase.FromGrayscaleAvx(8).ConvertToRgbInplace(values);
         }
+#endif
     }
 }
diff --git a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/RgbColorConversion.cs b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/RgbColorConversion.cs
index 517630a500..69c1a39741 100644
--- a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/RgbColorConversion.cs
+++ b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/RgbColorConversion.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using BenchmarkDotNet.Attributes;
@@ -19,7 +19,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
         {
             var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
 
-            new JpegColorConverterBase.FromRgbBasic(8).ConvertToRgbInplace(values);
+            new JpegColorConverterBase.FromRgbScalar(8).ConvertToRgbInplace(values);
         }
 
         [Benchmark]
@@ -30,12 +30,14 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
             new JpegColorConverterBase.FromRgbVector8(8).ConvertToRgbInplace(values);
         }
 
+#if SUPPORTS_RUNTIME_INTRINSICS
         [Benchmark]
-        public void SimdVectorAvx2()
+        public void SimdVectorAvx()
         {
             var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
 
-            new JpegColorConverterBase.FromRgbAvx2(8).ConvertToRgbInplace(values);
+            new JpegColorConverterBase.FromRgbAvx(8).ConvertToRgbInplace(values);
         }
+#endif
     }
 }
diff --git a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/YCbCrColorConversion.cs b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/YCbCrColorConversion.cs
index 3b142d9251..656cae1047 100644
--- a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/YCbCrColorConversion.cs
+++ b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/YCbCrColorConversion.cs
@@ -19,15 +19,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
         {
             var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
 
-            new JpegColorConverterBase.FromYCbCrBasic(8).ConvertToRgbInplace(values);
-        }
-
-        [Benchmark(Baseline = true)]
-        public void SimdVector()
-        {
-            var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
-
-            new JpegColorConverterBase.FromYCbCrVector4(8).ConvertToRgbInplace(values);
+            new JpegColorConverterBase.FromYCbCrScalar(8).ConvertToRgbInplace(values);
         }
 
         [Benchmark]
@@ -38,12 +30,14 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
             new JpegColorConverterBase.FromYCbCrVector8(8).ConvertToRgbInplace(values);
         }
 
+#if SUPPORTS_RUNTIME_INTRINSICS
         [Benchmark]
-        public void SimdVectorAvx2()
+        public void SimdVectorAvx()
         {
             var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
 
-            new JpegColorConverterBase.FromYCbCrAvx2(8).ConvertToRgbInplace(values);
+            new JpegColorConverterBase.FromYCbCrAvx(8).ConvertToRgbInplace(values);
         }
+#endif
     }
 }
diff --git a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/YccKColorConverter.cs b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/YccKColorConverter.cs
index b26ac0622d..6c0583b623 100644
--- a/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/YccKColorConverter.cs
+++ b/tests/ImageSharp.Benchmarks/Codecs/Jpeg/ColorConversion/YccKColorConverter.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using BenchmarkDotNet.Attributes;
@@ -19,7 +19,7 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
         {
             var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
 
-            new JpegColorConverterBase.FromYccKBasic(8).ConvertToRgbInplace(values);
+            new JpegColorConverterBase.FromYccKScalar(8).ConvertToRgbInplace(values);
         }
 
         [Benchmark]
@@ -30,12 +30,14 @@ namespace SixLabors.ImageSharp.Benchmarks.Codecs.Jpeg
             new JpegColorConverterBase.FromYccKVector8(8).ConvertToRgbInplace(values);
         }
 
+#if SUPPORTS_RUNTIME_INTRINSICS
         [Benchmark]
         public void SimdVectorAvx2()
         {
             var values = new JpegColorConverterBase.ComponentValues(this.Input, 0);
 
-            new JpegColorConverterBase.FromYccKAvx2(8).ConvertToRgbInplace(values);
+            new JpegColorConverterBase.FromYccKAvx(8).ConvertToRgbInplace(values);
         }
+#endif
     }
 }
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
index fc3529513e..41c9dd6a34 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
@@ -70,6 +70,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 seed);
         }
 
+#if SUPPORTS_RUNTIME_INTRINSICS
         [Theory]
         [MemberData(nameof(CommonConversionData))]
         public void FromYCbCrAvx2(int inputBufferLength, int resultBufferLength, int seed)
@@ -87,6 +88,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 resultBufferLength,
                 seed);
         }
+#endif
 
         [Theory]
         [MemberData(nameof(CommonConversionData))]
@@ -130,6 +132,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 seed);
         }
 
+#if SUPPORTS_RUNTIME_INTRINSICS
         [Theory]
         [MemberData(nameof(CommonConversionData))]
         public void FromCmykAvx2(int inputBufferLength, int resultBufferLength, int seed)
@@ -147,6 +150,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 resultBufferLength,
                 seed);
         }
+#endif
 
         [Theory]
         [MemberData(nameof(CommonConversionData))]
@@ -172,6 +176,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 seed);
         }
 
+#if SUPPORTS_RUNTIME_INTRINSICS
         [Theory]
         [MemberData(nameof(CommonConversionData))]
         public void FromGrayscaleAvx2(int inputBufferLength, int resultBufferLength, int seed)
@@ -189,6 +194,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 resultBufferLength,
                 seed);
         }
+#endif
 
         [Theory]
         [MemberData(nameof(CommonConversionData))]
@@ -232,6 +238,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 seed);
         }
 
+#if SUPPORTS_RUNTIME_INTRINSICS
         [Theory]
         [MemberData(nameof(CommonConversionData))]
         public void FromRgbAvx2(int inputBufferLength, int resultBufferLength, int seed)
@@ -249,6 +256,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 resultBufferLength,
                 seed);
         }
+#endif
 
         [Theory]
         [MemberData(nameof(CommonConversionData))]
@@ -292,6 +300,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 seed);
         }
 
+#if SUPPORTS_RUNTIME_INTRINSICS
         [Theory]
         [MemberData(nameof(CommonConversionData))]
         public void FromYccKAvx2(int inputBufferLength, int resultBufferLength, int seed)
@@ -309,6 +318,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 resultBufferLength,
                 seed);
         }
+#endif
 
         [Theory]
         [MemberData(nameof(CommonConversionData))]