diff --git a/OpenNest.IO.Tests/NestSnapshotTests.cs b/OpenNest.IO.Tests/NestSnapshotTests.cs
index 879c0811..1497e4dc 100644
--- a/OpenNest.IO.Tests/NestSnapshotTests.cs
+++ b/OpenNest.IO.Tests/NestSnapshotTests.cs
@@ -137,7 +137,7 @@ public class NestSnapshotTests
     {
         var nest = new Nest("snapshot");
         nest.PlateDefaults.Size = new Size(40, 20);
-        var square = Square();
+        var square = TestDrawings.Square();
         var bar = new Drawing("Bar", ConvertGeometry.ToProgram(new List<Entity>
         {
             new Line(0, 0, 8, 0),
@@ -176,13 +176,4 @@ public class NestSnapshotTests
         nest.CreatePlate();
         return nest;
     }
-
-    private static Drawing Square() =>
-        new("Square", ConvertGeometry.ToProgram(new List<Entity>
-        {
-            new Line(0, 0, 4, 0),
-            new Line(4, 0, 4, 4),
-            new Line(4, 4, 0, 4),
-            new Line(0, 4, 0, 0),
-        }));
 }
diff --git a/OpenNest.IO.Tests/PartCuttingParametersPersistenceTests.cs b/OpenNest.IO.Tests/PartCuttingParametersPersistenceTests.cs
index 1147376c..720725d2 100644
--- a/OpenNest.IO.Tests/PartCuttingParametersPersistenceTests.cs
+++ b/OpenNest.IO.Tests/PartCuttingParametersPersistenceTests.cs
@@ -15,7 +15,7 @@ public class PartCuttingParametersPersistenceTests
     public void ManualLeadIns_KeepTheirSettings_AndCleanPartsWriteNone()
     {
         var nest = new Nest("manual");
-        var drawing = Square();
+        var drawing = TestDrawings.Square();
         nest.Drawings.Add(drawing);
         var plate = nest.CreatePlate();
         var leaded = new Part(drawing, new Vector(1, 1));
@@ -42,7 +42,7 @@ public class PartCuttingParametersPersistenceTests
     public void CommittedCuttingPlan_KeepsEachPartsSettings()
     {
         var nest = new Nest("planned");
-        var drawing = Square();
+        var drawing = TestDrawings.Square();
         nest.Drawings.Add(drawing);
         var plate = nest.CreatePlate();
         plate.Parts.Add(new Part(drawing, new Vector(1, 1)));
@@ -65,7 +65,7 @@ public class PartCuttingParametersPersistenceTests
     public void OlderFiles_WithoutTheField_ReadNullSettings()
     {
         var nest = new Nest("legacy");
-        var drawing = Square();
+        var drawing = TestDrawings.Square();
         nest.Drawings.Add(drawing);
         var part = new Part(drawing, new Vector(1, 1));
         part.ApplyLeadIns(Parameters(0.3), Vector.Zero);
@@ -80,15 +80,6 @@ public class PartCuttingParametersPersistenceTests
         Assert.Null(copy.CuttingParameters);
     }
 
-    private static Drawing Square() =>
-        new("Square", ConvertGeometry.ToProgram(new List<Entity>
-        {
-            new Line(0, 0, 4, 0),
-            new Line(4, 0, 4, 4),
-            new Line(4, 4, 0, 4),
-            new Line(0, 4, 0, 0),
-        }));
-
     private static CuttingParameters Parameters(double leadLength) => new()
     {
         ExternalLeadIn = new LineLeadIn { Length = leadLength, ApproachAngle = 45 },
diff --git a/OpenNest.IO.Tests/TestDrawings.cs b/OpenNest.IO.Tests/TestDrawings.cs
new file mode 100644
index 00000000..d217dc9f
--- /dev/null
+++ b/OpenNest.IO.Tests/TestDrawings.cs
@@ -0,0 +1,18 @@
+using OpenNest.Converters;
+using OpenNest.Geometry;
+
+namespace OpenNest.IO.Tests;
+
+/// <summary>Drawings the persistence tests share.</summary>
+internal static class TestDrawings
+{
+    /// <summary>A 4 x 4 square drawing named "Square", built from lines.</summary>
+    public static Drawing Square() =>
+        new("Square", ConvertGeometry.ToProgram(new List<Entity>
+        {
+            new Line(0, 0, 4, 0),
+            new Line(4, 0, 4, 4),
+            new Line(4, 4, 0, 4),
+            new Line(0, 4, 0, 0),
+        }));
+}