Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -rfae525350cc755ecc783bd4ac3fc13aed2e4ccaa -r92210258706d0f57e05552037b676bd941a6fe19
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision fae525350cc755ecc783bd4ac3fc13aed2e4ccaa)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 92210258706d0f57e05552037b676bd941a6fe19)
@@ -41,6 +41,7 @@
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Forms.PresentationObjects;
@@ -852,14 +853,14 @@
                         Assert.IsTrue(msgs.MoveNext());
                         Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gestart.", msgs.Current);
                         Assert.IsTrue(msgs.MoveNext());
-                        Assert.AreEqual($"Validatie van '{calculation.Name}' is gestart.", msgs.Current);
+                        CalculationServiceTestHelper.AssertValidationStartMessage(msgs.Current);
                         for (var i = 0; i < expectedValidationMessageCount; i++)
                         {
                             Assert.IsTrue(msgs.MoveNext());
                             StringAssert.StartsWith("Validatie mislukt: ", msgs.Current);
                         }
                         Assert.IsTrue(msgs.MoveNext());
-                        Assert.AreEqual($"Validatie van '{calculation.Name}' is beëindigd.", msgs.Current);
+                        CalculationServiceTestHelper.AssertValidationEndMessage(msgs.Current);
                         Assert.IsTrue(msgs.MoveNext());
                         Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is mislukt.", msgs.Current);
                     });
@@ -964,13 +965,13 @@
                         Assert.IsTrue(msgs.MoveNext());
                         Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gestart.", msgs.Current);
                         Assert.IsTrue(msgs.MoveNext());
-                        Assert.AreEqual($"Validatie van '{calculation.Name}' is gestart.", msgs.Current);
+                        CalculationServiceTestHelper.AssertValidationStartMessage(msgs.Current);
                         Assert.IsTrue(msgs.MoveNext());
-                        Assert.AreEqual($"Validatie van '{calculation.Name}' is beëindigd.", msgs.Current);
+                        CalculationServiceTestHelper.AssertValidationEndMessage(msgs.Current);
                         Assert.IsTrue(msgs.MoveNext());
-                        Assert.AreEqual($"Berekening van '{calculation.Name}' is gestart.", msgs.Current);
+                        CalculationServiceTestHelper.AssertCalculationStartMessage(msgs.Current);
                         Assert.IsTrue(msgs.MoveNext());
-                        Assert.AreEqual($"Berekening van '{calculation.Name}' is beëindigd.", msgs.Current);
+                        CalculationServiceTestHelper.AssertCalculationEndMessage(msgs.Current);
                         Assert.IsTrue(msgs.MoveNext());
                         Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gelukt.", msgs.Current);
                     });