diff --git a/tests/ImageSharp.Tests/Formats/Gif/GifDecoderCoreTests.cs b/tests/ImageSharp.Tests/Formats/Gif/GifDecoderCoreTests.cs
index 3e3010cfc..e1e3e94b0 100644
--- a/tests/ImageSharp.Tests/Formats/Gif/GifDecoderCoreTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Gif/GifDecoderCoreTests.cs
@@ -22,7 +22,7 @@ namespace ImageSharp.Tests
 
             TestFile testFile = TestFile.Create(TestImages.Gif.Rings);
 
-            using (Image image = new Image(testFile.FilePath, options))
+            using (Image image = testFile.CreateImage(options))
             {
                 Assert.Equal(1, image.MetaData.Properties.Count);
                 Assert.Equal("Comments", image.MetaData.Properties[0].Name);
@@ -40,7 +40,7 @@ namespace ImageSharp.Tests
 
             TestFile testFile = TestFile.Create(TestImages.Gif.Rings);
 
-            using (Image image = new Image(testFile.FilePath, options))
+            using (Image image = testFile.CreateImage(options))
             {
                 Assert.Equal(0, image.MetaData.Properties.Count);
             }
@@ -56,7 +56,7 @@ namespace ImageSharp.Tests
 
             TestFile testFile = TestFile.Create(TestImages.Gif.Rings);
 
-            using (Image image = new Image(testFile.FilePath, options))
+            using (Image image = testFile.CreateImage(options))
             {
                 Assert.Equal(1, image.MetaData.Properties.Count);
                 Assert.Equal("浉条卥慨灲", image.MetaData.Properties[0].Value);
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderCoreTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderCoreTests.cs
index 18d9e3acf..38d2a455e 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderCoreTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderCoreTests.cs
@@ -19,7 +19,7 @@ namespace ImageSharp.Tests
 
           TestFile testFile = TestFile.Create(TestImages.Jpeg.Baseline.Floorplan);
 
-          using (Image image = new Image(testFile.FilePath, options))
+          using (Image image = testFile.CreateImage(options))
           {
               Assert.NotNull(image.MetaData.ExifProfile);
           }
@@ -35,7 +35,7 @@ namespace ImageSharp.Tests
 
           TestFile testFile = TestFile.Create(TestImages.Jpeg.Baseline.Floorplan);
 
-          using (Image image = new Image(testFile.FilePath, options))
+          using (Image image = testFile.CreateImage(options))
           {
               Assert.Null(image.MetaData.ExifProfile);
           }
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngDecoderCoreTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngDecoderCoreTests.cs
index 3ee2ea826..766172ec6 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngDecoderCoreTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngDecoderCoreTests.cs
@@ -22,7 +22,7 @@ namespace ImageSharp.Tests
 
             TestFile testFile = TestFile.Create(TestImages.Png.Blur);
 
-            using (Image image = new Image(testFile.FilePath, options))
+            using (Image image = testFile.CreateImage(options))
             {
                 Assert.Equal(1, image.MetaData.Properties.Count);
                 Assert.Equal("Software", image.MetaData.Properties[0].Name);
@@ -40,7 +40,7 @@ namespace ImageSharp.Tests
 
             TestFile testFile = TestFile.Create(TestImages.Png.Blur);
 
-            using (Image image = new Image(testFile.FilePath, options))
+            using (Image image = testFile.CreateImage(options))
             {
                 Assert.Equal(0, image.MetaData.Properties.Count);
             }
@@ -56,7 +56,7 @@ namespace ImageSharp.Tests
 
             TestFile testFile = TestFile.Create(TestImages.Png.Blur);
 
-            using (Image image = new Image(testFile.FilePath, options))
+            using (Image image = testFile.CreateImage(options))
             {
                 Assert.Equal(1, image.MetaData.Properties.Count);
                 Assert.Equal("潓瑦慷敲", image.MetaData.Properties[0].Name);
diff --git a/tests/ImageSharp.Tests/TestFile.cs b/tests/ImageSharp.Tests/TestFile.cs
index 891a45cec..0c9cc5f47 100644
--- a/tests/ImageSharp.Tests/TestFile.cs
+++ b/tests/ImageSharp.Tests/TestFile.cs
@@ -130,6 +130,18 @@ namespace ImageSharp.Tests
             return new Image(this.image);
         }
 
+        /// <summary>
+        /// Creates a new image.
+        /// </summary>
+        /// <param name="options">The options for the decoder.</param>
+        /// <returns>
+        /// The <see cref="Image"/>.
+        /// </returns>
+        public Image CreateImage(IDecoderOptions options)
+        {
+            return new Image(this.Bytes, options);
+        }
+
         /// <summary>
         /// Gets the correct path to the formats directory.
         /// </summary>