Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/PipingCalculationScenarioTestFactoryTest.cs
===================================================================
diff -u -r3bcc8993307e3b6dea8f496d6acbc9c474581787 -rd2953d6162e73a4056e2cf2bb383a574d7c32136
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/PipingCalculationScenarioTestFactoryTest.cs	(.../PipingCalculationScenarioTestFactoryTest.cs)	(revision 3bcc8993307e3b6dea8f496d6acbc9c474581787)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/PipingCalculationScenarioTestFactoryTest.cs	(.../PipingCalculationScenarioTestFactoryTest.cs)	(revision d2953d6162e73a4056e2cf2bb383a574d7c32136)
@@ -91,12 +91,27 @@
         }
 
         [Test]
-        public void CreatePipingCalculationScenarioWithValidInput_CreatesPipingCalculationScenarioWithValidInput()
+        public void CreatePipingCalculationScenarioWithValidInput_HydraulicBoundaryLocationNull_ThrowsArgumentnullException()
         {
             // Call
-            PipingCalculationScenario scenario = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput();
+            TestDelegate test = () => PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(null);
 
             // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
+            Assert.AreEqual("hydraulicBoundaryLocation", paramName);
+        }
+
+        [Test]
+        public void CreatePipingCalculationScenarioWithValidInput_HydraulicBoundaryLocation_CreatesPipingCalculationScenarioWithValidInput()
+        {
+            // Setup
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+
+            // Call
+            PipingCalculationScenario scenario = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+
+            // Assert
+            Assert.AreSame(hydraulicBoundaryLocation, scenario.InputParameters.HydraulicBoundaryLocation);
             Assert.IsTrue(PipingCalculationService.Validate(scenario, (RoundedDouble) 1.1));
         }
     }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioTestFactory.cs
===================================================================
diff -u -r7cccb012b51218b8989007633d8338eaf435d6f4 -rd2953d6162e73a4056e2cf2bb383a574d7c32136
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioTestFactory.cs	(.../PipingCalculationScenarioTestFactory.cs)	(revision 7cccb012b51218b8989007633d8338eaf435d6f4)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioTestFactory.cs	(.../PipingCalculationScenarioTestFactory.cs)	(revision d2953d6162e73a4056e2cf2bb383a574d7c32136)
@@ -26,7 +26,6 @@
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.Probabilistics;
-using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Piping.Data.SoilProfile;
 using Ringtoets.Piping.Primitives;
 
@@ -112,9 +111,17 @@
         /// <summary>
         /// Creates a scenario with valid input.
         /// </summary>
+        /// <param name="hydraulicBoundaryLocation">The hydraulic boundary location to set to the input.</param>
         /// <returns>A new <see cref="PipingCalculationScenario"/>.</returns>
-        public static PipingCalculationScenario CreatePipingCalculationScenarioWithValidInput()
+        /// <remarks>The caller is responsible for actually providing a valid hydraulic boundary location.</remarks>
+        /// <exception cref="ArgumentNullException">Throw when <paramref name="hydraulicBoundaryLocation"/> is <c>null</c>.</exception>
+        public static PipingCalculationScenario CreatePipingCalculationScenarioWithValidInput(HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
+            if (hydraulicBoundaryLocation == null)
+            {
+                throw new ArgumentNullException(nameof(hydraulicBoundaryLocation));
+            }
+
             const double bottom = 1.12;
             const double top = 10.56;
             var stochasticSoilProfile = new PipingStochasticSoilProfile(
@@ -167,17 +174,6 @@
             surfaceLine.SetBottomDitchPolderSideAt(fourthCharacteristicPointLocation);
             surfaceLine.SetDitchPolderSideAt(fifthCharacteristicPointLocation);
             surfaceLine.ReferenceLineIntersectionWorldPoint = new Point2D(0.0, 0.0);
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation
-            {
-                DesignWaterLevelCalculation2 =
-                {
-                    Output = new TestHydraulicBoundaryLocationOutput(1.1)
-                },
-                DesignWaterLevelCalculation3 =
-                {
-                    Output = new TestHydraulicBoundaryLocationOutput(2.2)
-                }
-            };
 
             return new PipingCalculationScenario(new GeneralPipingInput())
             {