diff --git a/tests/ImageProcessorCore.Tests/FileTestBase.cs b/tests/ImageProcessorCore.Tests/FileTestBase.cs
index aff63e8d2..a0f447510 100644
--- a/tests/ImageProcessorCore.Tests/FileTestBase.cs
+++ b/tests/ImageProcessorCore.Tests/FileTestBase.cs
@@ -19,21 +19,21 @@ namespace ImageProcessorCore.Tests
         /// </summary>
         protected static readonly List<string> Files = new List<string>
         {
-            //"TestImages/Formats/Png/pl.png",
-            //"TestImages/Formats/Png/pd.png",
-            //"TestImages/Formats/Jpg/Floorplan.jpeg", // Perf: Enable for local testing only
-            "TestImages/Formats/Jpg/Calliphora.jpg",
-            //"TestImages/Formats/Jpg/turtle.jpg",
-            //"TestImages/Formats/Jpg/fb.jpg", // Perf: Enable for local testing only
-            //"TestImages/Formats/Jpg/progress.jpg", // Perf: Enable for local testing only
-            //"TestImages/Formats/Jpg/gamma_dalai_lama_gray.jpg", // Perf: Enable for local testing only
-            "TestImages/Formats/Bmp/Car.bmp",
-            // "TestImages/Formats/Bmp/neg_height.bmp", // Perf: Enable for local testing only
-            //"TestImages/Formats/Png/blur.png", // Perf: Enable for local testing only
-            //"TestImages/Formats/Png/indexed.png", // Perf: Enable for local testing only
-            "TestImages/Formats/Png/splash.png",
-            "TestImages/Formats/Gif/rings.gif",
-            //"TestImages/Formats/Gif/giphy.gif" // Perf: Enable for local testing only
+            //TestImages.Png.P1,
+            //TestImages.Png.Pd,
+            //TestImages.Jpg.Floorplan, // Perf: Enable for local testing only
+            TestImages.Jpg.Calliphora,
+            //TestImages.Jpg.Turtle,
+            //TestImages.Jpg.Fb, // Perf: Enable for local testing only
+            //TestImages.Jpg.Progress, // Perf: Enable for local testing only
+            //TestImages.Jpg.Gamma_dalai_lama_gray. // Perf: Enable for local testing only
+            TestImages.Bmp.Car,
+            //TestImages.Bmp.Neg_height, // Perf: Enable for local testing only
+            //TestImages.Png.Blur, // Perf: Enable for local testing only
+            //TestImages.Png.Indexed, // Perf: Enable for local testing only
+            TestImages.Png.Splash,
+            TestImages.Gif.Rings,
+            //TestImages.Gif.Giphy // Perf: Enable for local testing only
         };
 
         protected void ProgressUpdate(object sender, ProgressEventArgs e)
diff --git a/tests/ImageProcessorCore.Tests/TestImages.cs b/tests/ImageProcessorCore.Tests/TestImages.cs
new file mode 100644
index 000000000..f9c5bb243
--- /dev/null
+++ b/tests/ImageProcessorCore.Tests/TestImages.cs
@@ -0,0 +1,52 @@
+// <copyright file="FileTestBase.cs" company="James Jackson-South">
+// Copyright (c) James Jackson-South and contributors.
+// Licensed under the Apache License, Version 2.0.
+// </copyright>
+
+namespace ImageProcessorCore.Tests
+{
+    /// <summary>
+    /// Class that contains all the test images.
+    /// </summary>
+    public static class TestImages
+    {
+        public static class Png
+        {
+            private static readonly string folder = "TestImages/Formats/Png/";
+
+            public static string P1 { get { return folder + "pl.png"; } }
+            public static string Pd { get { return folder + "pd.png"; } }
+            public static string Blur { get { return folder + "blur.png"; } }
+            public static string Indexed { get { return folder + "indexed.png"; } }
+            public static string Splash { get { return folder + "splash.png"; } }
+        }
+
+        public static class Jpg
+        {
+            private static readonly string folder = "TestImages/Formats/Jpg/";
+
+            public static string Floorplan { get { return folder + "Floorplan.jpeg"; } }
+            public static string Calliphora { get { return folder + "Calliphora.jpg"; } }
+            public static string Turtle { get { return folder + "turtle.jpg"; } }
+            public static string Fb { get { return folder + "fb.jpg"; } }
+            public static string Progress { get { return folder + "progress.jpg"; } }
+            public static string Gamma_dalai_lama_gray { get { return folder + "gamma_dalai_lama_gray.jpg"; } }
+        }
+
+        public static class Bmp
+        {
+            private static readonly string folder = "TestImages/Formats/Bmp/";
+
+            public static string Car { get { return folder + "Car.bmp"; } }
+            public static string Neg_height { get { return folder + "neg_height.bmp"; } }
+        }
+
+        public static class Gif
+        {
+            private static readonly string folder = "TestImages/Formats/Gif/";
+
+            public static string Rings { get { return folder + "rings.gif"; } }
+            public static string Giphy { get { return folder + "giphy.gif"; } }
+        }
+    }
+}