Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Resources/KunstwerkenBetrouwbaarheidSluitenSchema.xsd
===================================================================
diff -u -ref881721312166028ed88eaa21dfd1ee8a5cbba4 -ra30f9d7481fafa59f356cf3a9691c4cf1ef7e981
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Resources/KunstwerkenBetrouwbaarheidSluitenSchema.xsd	(.../KunstwerkenBetrouwbaarheidSluitenSchema.xsd)	(revision ef881721312166028ed88eaa21dfd1ee8a5cbba4)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Resources/KunstwerkenBetrouwbaarheidSluitenSchema.xsd	(.../KunstwerkenBetrouwbaarheidSluitenSchema.xsd)	(revision a30f9d7481fafa59f356cf3a9691c4cf1ef7e981)
@@ -33,7 +33,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="factorstormduur" minOccurs="0"/>
             <xs:element ref="kunstwerk" minOccurs="0"/>
             <xs:element ref="orientatie" minOccurs="0"/>
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r25a6f6fc7f89feb479282171ab01fc277e5c8d64 -ra30f9d7481fafa59f356cf3a9691c4cf1ef7e981
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs	(.../ClosingStructuresCalculationConfigurationReaderTest.cs)	(revision 25a6f6fc7f89feb479282171ab01fc277e5c8d64)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs	(.../ClosingStructuresCalculationConfigurationReaderTest.cs)	(revision a30f9d7481fafa59f356cf3a9691c4cf1ef7e981)
@@ -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/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/invalidCalculationHydraulicBoundaryLocationOldAndNew.xml
===================================================================
diff -u
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/invalidCalculationHydraulicBoundaryLocationOldAndNew.xml	(revision 0)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/invalidCalculationHydraulicBoundaryLocationOldAndNew.xml	(revision a30f9d7481fafa59f356cf3a9691c4cf1ef7e981)
@@ -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