Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Resources/KunstwerkenHoogteSchema.xsd
===================================================================
diff -u -ref881721312166028ed88eaa21dfd1ee8a5cbba4 -rbc8a1be0c620459988526f8f1f22267ddc91e710
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Resources/KunstwerkenHoogteSchema.xsd	(.../KunstwerkenHoogteSchema.xsd)	(revision ef881721312166028ed88eaa21dfd1ee8a5cbba4)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Resources/KunstwerkenHoogteSchema.xsd	(.../KunstwerkenHoogteSchema.xsd)	(revision bc8a1be0c620459988526f8f1f22267ddc91e710)
@@ -31,7 +31,7 @@
       <xs:complexContent>
         <xs:extension base="berekeningType">
           <xs:all>
-            <xs:element ref="hrlocatie" minOccurs="0"/>
+            <xs:element ref="hblocatie-of-hrlocatie" minOccurs="0"/>
             <xs:element ref="kunstwerk" minOccurs="0"/>
             <xs:element ref="orientatie" minOccurs="0"/>
             <xs:element ref="faalkansgegevenerosiebodem" minOccurs="0"/>
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r6949918830314633db5cc8c16bb2188779fffc93 -rbc8a1be0c620459988526f8f1f22267ddc91e710
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationReaderTest.cs	(.../HeightStructuresCalculationConfigurationReaderTest.cs)	(revision 6949918830314633db5cc8c16bb2188779fffc93)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationReaderTest.cs	(.../HeightStructuresCalculationConfigurationReaderTest.cs)	(revision bc8a1be0c620459988526f8f1f22267ddc91e710)
@@ -56,6 +56,9 @@
                 yield return new TestCaseData("invalidCalculationHydraulicBoundaryLocationEmpty.xml",
                                               "The 'hrlocatie' element is invalid - The value '' is invalid according to its datatype 'String'")
                     .SetName("invalidCalculationHydraulicBoundaryLocationEmpty");
+                yield return new TestCaseData("invalidCalculationHydraulicBoundaryLocationOldAndNew.xml",
+                                              "Element 'hblocatie' cannot appear more than once if content model type is \"all\".")
+                    .SetName("invalidCalculationHydraulicBoundaryLocationOldAndNew");
 
                 yield return new TestCaseData("invalidCalculationMultipleFailureProbabilityStructureWithErosion.xml",
                                               "Element 'faalkansgegevenerosiebodem' cannot appear more than once if content model type is \"all\".")
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationReader/invalidCalculationHydraulicBoundaryLocationOldAndNew.xml
===================================================================
diff -u
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationReader/invalidCalculationHydraulicBoundaryLocationOldAndNew.xml	(revision 0)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationReader/invalidCalculationHydraulicBoundaryLocationOldAndNew.xml	(revision bc8a1be0c620459988526f8f1f22267ddc91e710)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <hrlocatie>locatie 1</hrlocatie>
+    <hblocatie>locatie 2</hblocatie>
+  </berekening>
+</configuratie>
\ No newline at end of file