Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocation.cs
===================================================================
diff -u -rf437ce42a2f6cdaed8749c6fb906d631e42c28b7 -r09a1fa2c8f52e762264a4679a83beb856b3c8162
--- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocation.cs	(.../HydraulicBoundaryLocation.cs)	(revision f437ce42a2f6cdaed8749c6fb906d631e42c28b7)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocation.cs	(.../HydraulicBoundaryLocation.cs)	(revision 09a1fa2c8f52e762264a4679a83beb856b3c8162)
@@ -49,14 +49,15 @@
             Name = name;
             Location = new Point2D(coordinateX, coordinateY);
 
-            DesignWaterLevelCalculation1 = new HydraulicBoundaryLocationCalculation();
-            DesignWaterLevelCalculation2 = new HydraulicBoundaryLocationCalculation();
-            DesignWaterLevelCalculation3 = new HydraulicBoundaryLocationCalculation();
-            DesignWaterLevelCalculation4 = new HydraulicBoundaryLocationCalculation();
-            WaveHeightCalculation1 = new HydraulicBoundaryLocationCalculation();
-            WaveHeightCalculation2 = new HydraulicBoundaryLocationCalculation();
-            WaveHeightCalculation3 = new HydraulicBoundaryLocationCalculation();
-            WaveHeightCalculation4 = new HydraulicBoundaryLocationCalculation();
+            DesignWaterLevelCalculation1 = new HydraulicBoundaryLocationCalculation(this);
+            DesignWaterLevelCalculation2 = new HydraulicBoundaryLocationCalculation(this);
+            DesignWaterLevelCalculation3 = new HydraulicBoundaryLocationCalculation(this);
+            DesignWaterLevelCalculation4 = new HydraulicBoundaryLocationCalculation(this);
+
+            WaveHeightCalculation1 = new HydraulicBoundaryLocationCalculation(this);
+            WaveHeightCalculation2 = new HydraulicBoundaryLocationCalculation(this);
+            WaveHeightCalculation3 = new HydraulicBoundaryLocationCalculation(this);
+            WaveHeightCalculation4 = new HydraulicBoundaryLocationCalculation(this);
         }
 
         /// <summary>
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationTest.cs
===================================================================
diff -u -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c -r09a1fa2c8f52e762264a4679a83beb856b3c8162
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationTest.cs	(.../HydraulicBoundaryLocationTest.cs)	(revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationTest.cs	(.../HydraulicBoundaryLocationTest.cs)	(revision 09a1fa2c8f52e762264a4679a83beb856b3c8162)
@@ -62,15 +62,15 @@
             Assert.AreEqual(x, location.X);
             Assert.AreEqual(y, location.Y);
 
-            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.DesignWaterLevelCalculation1);
-            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.DesignWaterLevelCalculation2);
-            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.DesignWaterLevelCalculation3);
-            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.DesignWaterLevelCalculation4);
+            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation, hydraulicBoundaryLocation.DesignWaterLevelCalculation1);
+            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation, hydraulicBoundaryLocation.DesignWaterLevelCalculation2);
+            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation, hydraulicBoundaryLocation.DesignWaterLevelCalculation3);
+            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation, hydraulicBoundaryLocation.DesignWaterLevelCalculation4);
 
-            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.WaveHeightCalculation1);
-            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.WaveHeightCalculation2);
-            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.WaveHeightCalculation3);
-            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.WaveHeightCalculation4);
+            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation, hydraulicBoundaryLocation.WaveHeightCalculation1);
+            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation, hydraulicBoundaryLocation.WaveHeightCalculation2);
+            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation, hydraulicBoundaryLocation.WaveHeightCalculation3);
+            AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation, hydraulicBoundaryLocation.WaveHeightCalculation4);
         }
 
         [Test]
@@ -87,9 +87,11 @@
             Assert.AreEqual(testName, result);
         }
 
-        private static void AssertHydraulicBoundaryLocationCalculation(HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation)
+        private static void AssertHydraulicBoundaryLocationCalculation(HydraulicBoundaryLocation hydraulicBoundaryLocation,
+                                                                       HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation)
         {
             Assert.IsNotNull(hydraulicBoundaryLocationCalculation);
+            Assert.AreSame(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation.HydraulicBoundaryLocation);
             Assert.IsNull(hydraulicBoundaryLocationCalculation.Output);
         }
     }