diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs
index 30d93e3d9..78bdfd159 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs
@@ -22,7 +22,7 @@
         [Params(16, 128, 1024)]
         public int Count { get; set; }
 
-        [Setup]
+        [GlobalSetup]
         public void Setup()
         {
             this.destination = new Buffer<Rgba32>(this.Count);
@@ -31,7 +31,7 @@
             this.destination.Pin();
         }
 
-        [Cleanup]
+        [GlobalCleanup]
         public void Cleanup()
         {
             this.source.Dispose();
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
index 501ae7949..34603c1df 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
@@ -16,14 +16,14 @@ namespace ImageSharp.Benchmarks.Color.Bulk
         [Params(16, 128, 1024)]
         public int Count { get; set; }
 
-        [Setup]
+        [GlobalSetup]
         public void Setup()
         {
             this.destination = new Buffer<TPixel>(this.Count);
             this.source = new Buffer<byte>(this.Count * 4);
         }
 
-        [Cleanup]
+        [GlobalCleanup]
         public void Cleanup()
         {
             this.destination.Dispose();
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
index 65a2988b9..9976faa8c 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
@@ -18,14 +18,14 @@ namespace ImageSharp.Benchmarks.Color.Bulk
         [Params(64, 300, 1024)]
         public int Count { get; set; }
 
-        [Setup]
+        [GlobalSetup]
         public void Setup()
         {
             this.source = new Buffer<TPixel>(this.Count);
             this.destination = new Buffer<Vector4>(this.Count);
         }
 
-        [Cleanup]
+        [GlobalCleanup]
         public void Cleanup()
         {
             this.source.Dispose();
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
index 3c75fc2d1..08a10ba2a 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
@@ -16,14 +16,14 @@ namespace ImageSharp.Benchmarks.Color.Bulk
         [Params(16, 128, 1024)]
         public int Count { get; set; }
 
-        [Setup]
+        [GlobalSetup]
         public void Setup()
         {
             this.source = new Buffer<TPixel>(this.Count);
             this.destination = new Buffer<byte>(this.Count * 3);
         }
 
-        [Cleanup]
+        [GlobalCleanup]
         public void Cleanup()
         {
             this.source.Dispose();
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
index f64bf561b..99779c25f 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
@@ -21,14 +21,14 @@ namespace ImageSharp.Benchmarks.Color.Bulk
         [Params(16, 128, 1024)]
         public int Count { get; set; }
 
-        [Setup]
+        [GlobalSetup]
         public void Setup()
         {
             this.source = new Buffer<TPixel>(this.Count);
             this.destination = new Buffer<byte>(this.Count * 4);
         }
 
-        [Cleanup]
+        [GlobalCleanup]
         public void Cleanup()
         {
             this.source.Dispose();
diff --git a/tests/ImageSharp.Benchmarks/Color/RgbToYCbCr.cs b/tests/ImageSharp.Benchmarks/Color/RgbToYCbCr.cs
index 0c777b86b..2efd9bc42 100644
--- a/tests/ImageSharp.Benchmarks/Color/RgbToYCbCr.cs
+++ b/tests/ImageSharp.Benchmarks/Color/RgbToYCbCr.cs
@@ -116,7 +116,7 @@
 
         private int[] inputSourceRGBAsInteger = null;
 
-        [Setup]
+        [GlobalSetup]
         public void Setup()
         {
             // Console.WriteLine("Vector<int>.Count: " + Vector<int>.Count);
diff --git a/tests/ImageSharp.Benchmarks/General/Array2D.cs b/tests/ImageSharp.Benchmarks/General/Array2D.cs
index 9d44fc93d..b7ac2cd86 100644
--- a/tests/ImageSharp.Benchmarks/General/Array2D.cs
+++ b/tests/ImageSharp.Benchmarks/General/Array2D.cs
@@ -27,7 +27,7 @@ namespace ImageSharp.Benchmarks.General
         public int Min { get; private set; }
         public int Max { get; private set; }
 
-        [Setup]
+        [GlobalSetup]
         public void SetUp()
         {
             this.flatArray = new float[this.Count * this.Count];
diff --git a/tests/ImageSharp.Benchmarks/General/ArrayCopy.cs b/tests/ImageSharp.Benchmarks/General/ArrayCopy.cs
index 31e9cc0e3..dd0ebd413 100644
--- a/tests/ImageSharp.Benchmarks/General/ArrayCopy.cs
+++ b/tests/ImageSharp.Benchmarks/General/ArrayCopy.cs
@@ -20,7 +20,7 @@ namespace ImageSharp.Benchmarks.General
 
         byte[] destination;
 
-        [Setup]
+        [GlobalSetup]
         public void SetUp()
         {
             this.source = new byte[this.Count];
diff --git a/tests/ImageSharp.Benchmarks/General/ArrayReverse.cs b/tests/ImageSharp.Benchmarks/General/ArrayReverse.cs
index 970f6b347..27341b146 100644
--- a/tests/ImageSharp.Benchmarks/General/ArrayReverse.cs
+++ b/tests/ImageSharp.Benchmarks/General/ArrayReverse.cs
@@ -18,7 +18,7 @@ namespace ImageSharp.Benchmarks.General
 
         byte[] destination;
 
-        [Setup]
+        [GlobalSetup]
         public void SetUp()
         {
             this.source = new byte[this.Count];
diff --git a/tests/ImageSharp.Benchmarks/General/ClearBuffer.cs b/tests/ImageSharp.Benchmarks/General/ClearBuffer.cs
index fc1b46a91..c3a309bb8 100644
--- a/tests/ImageSharp.Benchmarks/General/ClearBuffer.cs
+++ b/tests/ImageSharp.Benchmarks/General/ClearBuffer.cs
@@ -15,13 +15,13 @@ namespace ImageSharp.Benchmarks.General
         [Params(32, 128, 512)]
         public int Count { get; set; }
 
-        [Setup]
+        [GlobalSetup]
         public void Setup()
         {
             this.buffer = new Buffer<Rgba32>(this.Count);
         }
 
-        [Cleanup]
+        [GlobalCleanup]
         public void Cleanup()
         {
             this.buffer.Dispose();
diff --git a/tests/ImageSharp.Benchmarks/General/IterateArray.cs b/tests/ImageSharp.Benchmarks/General/IterateArray.cs
index b9e2f7acd..cc8d99b41 100644
--- a/tests/ImageSharp.Benchmarks/General/IterateArray.cs
+++ b/tests/ImageSharp.Benchmarks/General/IterateArray.cs
@@ -18,7 +18,7 @@ namespace ImageSharp.Benchmarks.General
         [Params(64, 1024)]
         public int Length { get; set; }
 
-        [Setup]
+        [GlobalSetup]
         public void Setup()
         {
             this.buffer = new Buffer<Vector4>(this.Length);
diff --git a/tests/ImageSharp.Benchmarks/General/PixelIndexing.cs b/tests/ImageSharp.Benchmarks/General/PixelIndexing.cs
index 18c99a744..bd2bf599c 100644
--- a/tests/ImageSharp.Benchmarks/General/PixelIndexing.cs
+++ b/tests/ImageSharp.Benchmarks/General/PixelIndexing.cs
@@ -145,7 +145,7 @@
         // [Params(1024)]
         public int Count { get; set; } = 1024;
 
-        [Setup]
+        [GlobalSetup]
         public void Setup()
         {
             this.width = 2048;
@@ -158,7 +158,7 @@
             this.endIndex = 2048 / 2 + (this.Count / 2);
         }
 
-        [Cleanup]
+        [GlobalCleanup]
         public void Cleanup()
         {
             this.buffer.Dispose();
diff --git a/tests/ImageSharp.Benchmarks/General/RoundSinglePrecisionBlocks.cs b/tests/ImageSharp.Benchmarks/General/RoundSinglePrecisionBlocks.cs
index 52880168d..f99829034 100644
--- a/tests/ImageSharp.Benchmarks/General/RoundSinglePrecisionBlocks.cs
+++ b/tests/ImageSharp.Benchmarks/General/RoundSinglePrecisionBlocks.cs
@@ -22,7 +22,7 @@
         private Block8x8F inputDividend = default(Block8x8F);
         private Block8x8F inputDivisior = default(Block8x8F);
 
-        [Setup]
+        [GlobalSetup]
         public void Setup()
         {
             for (int i = 0; i < Block8x8F.ScalarCount; i++)
diff --git a/tests/ImageSharp.Benchmarks/General/Vector4Constants.cs b/tests/ImageSharp.Benchmarks/General/Vector4Constants.cs
index a7afa336e..820789ee7 100644
--- a/tests/ImageSharp.Benchmarks/General/Vector4Constants.cs
+++ b/tests/ImageSharp.Benchmarks/General/Vector4Constants.cs
@@ -20,7 +20,7 @@ namespace ImageSharp.Benchmarks.General
 
         private Vector4 parameter;
 
-        [Setup]
+        [GlobalSetup]
         public void Setup()
         {
             this.random = new Random(42);
diff --git a/tests/ImageSharp.Benchmarks/General/Vectorization/BitwiseOrUint32.cs b/tests/ImageSharp.Benchmarks/General/Vectorization/BitwiseOrUint32.cs
index dd20e85d5..b882403c8 100644
--- a/tests/ImageSharp.Benchmarks/General/Vectorization/BitwiseOrUint32.cs
+++ b/tests/ImageSharp.Benchmarks/General/Vectorization/BitwiseOrUint32.cs
@@ -15,7 +15,7 @@ namespace ImageSharp.Benchmarks.General.Vectorization
 
         private uint testValue;
 
-        [Setup]
+        [GlobalSetup]
         public void Setup()
         {
             this.input = new uint[this.InputSize];
diff --git a/tests/ImageSharp.Benchmarks/General/Vectorization/DivFloat.cs b/tests/ImageSharp.Benchmarks/General/Vectorization/DivFloat.cs
index 61582b7dc..caadaaa34 100644
--- a/tests/ImageSharp.Benchmarks/General/Vectorization/DivFloat.cs
+++ b/tests/ImageSharp.Benchmarks/General/Vectorization/DivFloat.cs
@@ -15,7 +15,7 @@ namespace ImageSharp.Benchmarks.General.Vectorization
 
         private float testValue;
 
-        [Setup]
+        [GlobalSetup]
         public void Setup()
         {
             this.input = new float[this.InputSize];
diff --git a/tests/ImageSharp.Benchmarks/General/Vectorization/DivUInt32.cs b/tests/ImageSharp.Benchmarks/General/Vectorization/DivUInt32.cs
index 75fa03c04..6b3edb192 100644
--- a/tests/ImageSharp.Benchmarks/General/Vectorization/DivUInt32.cs
+++ b/tests/ImageSharp.Benchmarks/General/Vectorization/DivUInt32.cs
@@ -15,7 +15,7 @@ namespace ImageSharp.Benchmarks.General.Vectorization
 
         private uint testValue;
 
-        [Setup]
+        [GlobalSetup]
         public void Setup()
         {
             this.input = new uint[this.InputSize];
diff --git a/tests/ImageSharp.Benchmarks/General/Vectorization/MulFloat.cs b/tests/ImageSharp.Benchmarks/General/Vectorization/MulFloat.cs
index ee33cf210..e5ae49b2a 100644
--- a/tests/ImageSharp.Benchmarks/General/Vectorization/MulFloat.cs
+++ b/tests/ImageSharp.Benchmarks/General/Vectorization/MulFloat.cs
@@ -15,7 +15,7 @@ namespace ImageSharp.Benchmarks.General.Vectorization
 
         private float testValue;
 
-        [Setup]
+        [GlobalSetup]
         public void Setup()
         {
             this.input = new float[this.InputSize];
diff --git a/tests/ImageSharp.Benchmarks/General/Vectorization/MulUInt32.cs b/tests/ImageSharp.Benchmarks/General/Vectorization/MulUInt32.cs
index f7d6cf9b9..532acc02d 100644
--- a/tests/ImageSharp.Benchmarks/General/Vectorization/MulUInt32.cs
+++ b/tests/ImageSharp.Benchmarks/General/Vectorization/MulUInt32.cs
@@ -15,7 +15,7 @@ namespace ImageSharp.Benchmarks.General.Vectorization
 
         private uint testValue;
 
-        [Setup]
+        [GlobalSetup]
         public void Setup()
         {
             this.input = new uint[this.InputSize];
diff --git a/tests/ImageSharp.Benchmarks/General/Vectorization/ReinterpretUInt32AsFloat.cs b/tests/ImageSharp.Benchmarks/General/Vectorization/ReinterpretUInt32AsFloat.cs
index b0ca181cd..30443fad9 100644
--- a/tests/ImageSharp.Benchmarks/General/Vectorization/ReinterpretUInt32AsFloat.cs
+++ b/tests/ImageSharp.Benchmarks/General/Vectorization/ReinterpretUInt32AsFloat.cs
@@ -25,7 +25,7 @@ namespace ImageSharp.Benchmarks.General.Vectorization
         }
 
 
-        [Setup]
+        [GlobalSetup]
         public void Setup()
         {
             this.input = new uint[this.InputSize];
diff --git a/tests/ImageSharp.Benchmarks/General/Vectorization/VectorFetching.cs b/tests/ImageSharp.Benchmarks/General/Vectorization/VectorFetching.cs
index 018f11334..73fc88648 100644
--- a/tests/ImageSharp.Benchmarks/General/Vectorization/VectorFetching.cs
+++ b/tests/ImageSharp.Benchmarks/General/Vectorization/VectorFetching.cs
@@ -20,7 +20,7 @@ namespace ImageSharp.Benchmarks.General.Vectorization
         [Params(64)]
         public int InputSize { get; set; }
         
-        [Setup]
+        [GlobalSetup]
         public void Setup()
         {
             this.data = new float[this.InputSize];
diff --git a/tests/ImageSharp.Benchmarks/Image/DecodeBmp.cs b/tests/ImageSharp.Benchmarks/Image/DecodeBmp.cs
index 87baa8b7e..3c327bd56 100644
--- a/tests/ImageSharp.Benchmarks/Image/DecodeBmp.cs
+++ b/tests/ImageSharp.Benchmarks/Image/DecodeBmp.cs
@@ -18,7 +18,7 @@ namespace ImageSharp.Benchmarks.Image
     {
         private byte[] bmpBytes;
 
-        [Setup]
+        [GlobalSetup]
         public void ReadImages()
         {
             if (this.bmpBytes == null)
diff --git a/tests/ImageSharp.Benchmarks/Image/DecodeFilteredPng.cs b/tests/ImageSharp.Benchmarks/Image/DecodeFilteredPng.cs
index a1fddc502..8f79386a6 100644
--- a/tests/ImageSharp.Benchmarks/Image/DecodeFilteredPng.cs
+++ b/tests/ImageSharp.Benchmarks/Image/DecodeFilteredPng.cs
@@ -20,7 +20,7 @@ namespace ImageSharp.Benchmarks.Image
         private MemoryStream filter3;
         private MemoryStream filter4;
 
-        [Setup]
+        [GlobalSetup]
         public void ReadImages()
         {
             this.filter0 = new MemoryStream(File.ReadAllBytes("../ImageSharp.Tests/TestImages/Formats/Png/filter0.png"));
diff --git a/tests/ImageSharp.Benchmarks/Image/DecodeGif.cs b/tests/ImageSharp.Benchmarks/Image/DecodeGif.cs
index 02620fe74..b1e56c6bd 100644
--- a/tests/ImageSharp.Benchmarks/Image/DecodeGif.cs
+++ b/tests/ImageSharp.Benchmarks/Image/DecodeGif.cs
@@ -18,7 +18,7 @@ namespace ImageSharp.Benchmarks.Image
     {
         private byte[] gifBytes;
 
-        [Setup]
+        [GlobalSetup]
         public void ReadImages()
         {
             if (this.gifBytes == null)
diff --git a/tests/ImageSharp.Benchmarks/Image/DecodeJpeg.cs b/tests/ImageSharp.Benchmarks/Image/DecodeJpeg.cs
index ab45f95f4..455af48ad 100644
--- a/tests/ImageSharp.Benchmarks/Image/DecodeJpeg.cs
+++ b/tests/ImageSharp.Benchmarks/Image/DecodeJpeg.cs
@@ -18,7 +18,7 @@ namespace ImageSharp.Benchmarks.Image
     {
         private byte[] jpegBytes;
 
-        [Setup]
+        [GlobalSetup]
         public void ReadImages()
         {
             if (this.jpegBytes == null)
diff --git a/tests/ImageSharp.Benchmarks/Image/DecodePng.cs b/tests/ImageSharp.Benchmarks/Image/DecodePng.cs
index 9b71fd058..dd26a2cf7 100644
--- a/tests/ImageSharp.Benchmarks/Image/DecodePng.cs
+++ b/tests/ImageSharp.Benchmarks/Image/DecodePng.cs
@@ -18,7 +18,7 @@ namespace ImageSharp.Benchmarks.Image
     {
         private byte[] pngBytes;
 
-        [Setup]
+        [GlobalSetup]
         public void ReadImages()
         {
             if (this.pngBytes == null)
diff --git a/tests/ImageSharp.Benchmarks/Image/EncodeBmp.cs b/tests/ImageSharp.Benchmarks/Image/EncodeBmp.cs
index 52a039912..4941e17cb 100644
--- a/tests/ImageSharp.Benchmarks/Image/EncodeBmp.cs
+++ b/tests/ImageSharp.Benchmarks/Image/EncodeBmp.cs
@@ -20,7 +20,7 @@ namespace ImageSharp.Benchmarks.Image
         private Image bmpDrawing;
         private Image<Rgba32> bmpCore;
 
-        [Setup]
+        [GlobalSetup]
         public void ReadImages()
         {
             if (this.bmpStream == null)
@@ -32,7 +32,7 @@ namespace ImageSharp.Benchmarks.Image
             }
         }
 
-        [Cleanup]
+        [GlobalCleanup]
         public void Cleanup()
         {
             this.bmpStream.Dispose();
diff --git a/tests/ImageSharp.Benchmarks/Image/EncodeGif.cs b/tests/ImageSharp.Benchmarks/Image/EncodeGif.cs
index 5eaa8940b..e6600594f 100644
--- a/tests/ImageSharp.Benchmarks/Image/EncodeGif.cs
+++ b/tests/ImageSharp.Benchmarks/Image/EncodeGif.cs
@@ -20,7 +20,7 @@ namespace ImageSharp.Benchmarks.Image
         private Image bmpDrawing;
         private Image<Rgba32> bmpCore;
 
-        [Setup]
+        [GlobalSetup]
         public void ReadImages()
         {
             if (this.bmpStream == null)
@@ -32,7 +32,7 @@ namespace ImageSharp.Benchmarks.Image
             }
         }
 
-        [Cleanup]
+        [GlobalCleanup]
         public void Cleanup()
         {
             this.bmpStream.Dispose();
diff --git a/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs b/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs
index 4d25c82ef..88e82f079 100644
--- a/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs
+++ b/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs
@@ -27,7 +27,7 @@ namespace ImageSharp.Benchmarks.Image
         [Params(false)]
         public bool LargeImage { get; set; }
 
-        [Setup]
+        [GlobalSetup]
         public void ReadImages()
         {
             if (this.bmpStream == null)
@@ -41,7 +41,7 @@ namespace ImageSharp.Benchmarks.Image
             }
         }
 
-        [Cleanup]
+        [GlobalCleanup]
         public void Cleanup()
         {
             this.bmpStream.Dispose();
diff --git a/tests/ImageSharp.Benchmarks/Image/EncodeJpeg.cs b/tests/ImageSharp.Benchmarks/Image/EncodeJpeg.cs
index efd4e8ac5..07c2560fd 100644
--- a/tests/ImageSharp.Benchmarks/Image/EncodeJpeg.cs
+++ b/tests/ImageSharp.Benchmarks/Image/EncodeJpeg.cs
@@ -20,7 +20,7 @@ namespace ImageSharp.Benchmarks.Image
         private Image bmpDrawing;
         private Image<Rgba32> bmpCore;
 
-        [Setup]
+        [GlobalSetup]
         public void ReadImages()
         {
             if (this.bmpStream == null)
@@ -32,7 +32,7 @@ namespace ImageSharp.Benchmarks.Image
             }
         }
 
-        [Cleanup]
+        [GlobalCleanup]
         public void Cleanup()
         {
             this.bmpStream.Dispose();
diff --git a/tests/ImageSharp.Benchmarks/Image/EncodePng.cs b/tests/ImageSharp.Benchmarks/Image/EncodePng.cs
index 11182ac48..3ec83aa7c 100644
--- a/tests/ImageSharp.Benchmarks/Image/EncodePng.cs
+++ b/tests/ImageSharp.Benchmarks/Image/EncodePng.cs
@@ -29,7 +29,7 @@ namespace ImageSharp.Benchmarks.Image
         [Params(false)]
         public bool UseOctreeQuantizer { get; set; }
 
-        [Setup]
+        [GlobalSetup]
         public void ReadImages()
         {
             if (this.bmpStream == null)
@@ -44,7 +44,7 @@ namespace ImageSharp.Benchmarks.Image
             }
         }
 
-        [Cleanup]
+        [GlobalCleanup]
         public void Cleanup()
         {
             this.bmpStream.Dispose();
diff --git a/tests/ImageSharp.Benchmarks/Image/MultiImageBenchmarkBase.cs b/tests/ImageSharp.Benchmarks/Image/MultiImageBenchmarkBase.cs
index dfee978cc..e01a5951e 100644
--- a/tests/ImageSharp.Benchmarks/Image/MultiImageBenchmarkBase.cs
+++ b/tests/ImageSharp.Benchmarks/Image/MultiImageBenchmarkBase.cs
@@ -83,7 +83,7 @@ namespace ImageSharp.Benchmarks.Image
 
         protected abstract IEnumerable<string> InputImageSubfoldersOrFiles { get; }
 
-        [Setup]
+        [GlobalSetup]
         public void ReadImages()
         {
             if (!Vector.IsHardwareAccelerated)
diff --git a/tests/ImageSharp.Benchmarks/Samplers/DetectEdges.cs b/tests/ImageSharp.Benchmarks/Samplers/DetectEdges.cs
index e77716ec8..1f69030a0 100644
--- a/tests/ImageSharp.Benchmarks/Samplers/DetectEdges.cs
+++ b/tests/ImageSharp.Benchmarks/Samplers/DetectEdges.cs
@@ -17,7 +17,7 @@ namespace ImageSharp.Benchmarks
     {
         private Image<Rgba32> image;
 
-        [Setup]
+        [GlobalSetup]
         public void ReadImage()
         {
             if (this.image == null)
@@ -29,7 +29,7 @@ namespace ImageSharp.Benchmarks
             }
         }
 
-        [Cleanup]
+        [GlobalCleanup]
         public void Cleanup()
         {
             this.image.Dispose();
diff --git a/tests/ImageSharp.Benchmarks/Samplers/Glow.cs b/tests/ImageSharp.Benchmarks/Samplers/Glow.cs
index be4929d9a..049a00c1c 100644
--- a/tests/ImageSharp.Benchmarks/Samplers/Glow.cs
+++ b/tests/ImageSharp.Benchmarks/Samplers/Glow.cs
@@ -22,7 +22,7 @@ namespace ImageSharp.Benchmarks
         private GlowProcessor<Rgba32> bulk;
         private GlowProcessorParallel<Rgba32> parallel;
 
-        [Setup]
+        [GlobalSetup]
         public void Setup()
         {
             this.bulk = new GlowProcessor<Rgba32>(NamedColors<Rgba32>.Beige, GraphicsOptions.Default) { Radius = 800 * .5f, };