Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryCalculationSettingsFactory.cs
===================================================================
diff -u -r6a9567f3fbe71ef6a2721018e5da5994a99a6db1 -r08002aaa4f2fceae44c0371be629b083bbf179d3
--- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryCalculationSettingsFactory.cs	(.../HydraulicBoundaryCalculationSettingsFactory.cs)	(revision 6a9567f3fbe71ef6a2721018e5da5994a99a6db1)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryCalculationSettingsFactory.cs	(.../HydraulicBoundaryCalculationSettingsFactory.cs)	(revision 08002aaa4f2fceae44c0371be629b083bbf179d3)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.IO;
 
 namespace Ringtoets.Common.Data.Hydraulics
 {
@@ -36,20 +35,17 @@
         /// <param name="hydraulicBoundaryDatabase">The <see cref="HydraulicBoundaryDatabase"/>
         /// to create a <see cref="HydraulicBoundaryCalculationSettings"/> for.</param>
         /// <returns>A <see cref="HydraulicBoundaryCalculationSettings"/>.</returns>
-        /// <exception cref="ArgumentException">Thrown when <see cref="HydraulicBoundaryDatabase.FilePath"/>
-        /// is <c>null</c>, is empty or consists of whitespace.</exception>
+        /// <exception cref="ArgumentException">Thrown when the hydraulic boundary database file path or
+        /// the hlcd file path is <c>null</c>, is empty or consists of whitespace.</exception>
         public static HydraulicBoundaryCalculationSettings CreateSettings(HydraulicBoundaryDatabase hydraulicBoundaryDatabase)
         {
             if (hydraulicBoundaryDatabase == null)
             {
                 throw new ArgumentNullException(nameof(hydraulicBoundaryDatabase));
             }
 
-            string hydraulicBoundaryDatabaseFilePath = hydraulicBoundaryDatabase.FilePath;
-            string directory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath);
-            string hlcdFilePath = Path.Combine(directory, "HLCD.sqlite");
-            return new HydraulicBoundaryCalculationSettings(hydraulicBoundaryDatabaseFilePath,
-                                                            hlcdFilePath,
+            return new HydraulicBoundaryCalculationSettings(hydraulicBoundaryDatabase.FilePath,
+                                                            hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.FilePath,
                                                             hydraulicBoundaryDatabase.EffectivePreprocessorDirectory());
         }
     }
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryCalculationSettingsFactoryTest.cs
===================================================================
diff -u -r6a9567f3fbe71ef6a2721018e5da5994a99a6db1 -r08002aaa4f2fceae44c0371be629b083bbf179d3
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryCalculationSettingsFactoryTest.cs	(.../HydraulicBoundaryCalculationSettingsFactoryTest.cs)	(revision 6a9567f3fbe71ef6a2721018e5da5994a99a6db1)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryCalculationSettingsFactoryTest.cs	(.../HydraulicBoundaryCalculationSettingsFactoryTest.cs)	(revision 08002aaa4f2fceae44c0371be629b083bbf179d3)
@@ -46,19 +46,22 @@
         public void CreateSettings_WithHydraulicBoundaryDatabaseWithFilePath_ReturnsExpectedSettings()
         {
             // Setup
-            string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
-            string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
+            const string hydraulicBoundaryDatabaseFilePath = "some//FilePath//HRD dutch coast south.sqlite";
+            const string hlcdFilePath = "some//FilePath//HLCD dutch coast south.sqlite";
+
             var database = new HydraulicBoundaryDatabase
             {
-                FilePath = validFilePath
+                FilePath = hydraulicBoundaryDatabaseFilePath
             };
+            database.HydraulicLocationConfigurationSettings.SetValues(hlcdFilePath, string.Empty, 10, string.Empty,
+                                                                      null, null, null, null, null, null);
 
             // Call
             HydraulicBoundaryCalculationSettings settings = HydraulicBoundaryCalculationSettingsFactory.CreateSettings(database);
 
             // Assert
-            Assert.AreEqual(validFilePath, settings.HydraulicBoundaryDatabaseFilePath);
-            Assert.AreEqual(Path.Combine(testDataPath, "HLCD.sqlite"), settings.HlcdFilePath);
+            Assert.AreEqual(hydraulicBoundaryDatabaseFilePath, settings.HydraulicBoundaryDatabaseFilePath);
+            Assert.AreEqual(hlcdFilePath, settings.HlcdFilePath);
         }
 
         [Test]