diff --git a/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/OperationalLimitsGroupTest.java b/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/OperationalLimitsGroupTest.java
index 0ce92d7f4b2..a13a1efe8c9 100644
--- a/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/OperationalLimitsGroupTest.java
+++ b/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/OperationalLimitsGroupTest.java
@@ -117,7 +117,8 @@ void limitSetsAssociatedToEquipmentsTest() {
         ReadOnlyDataSource ds = new ResourceDataSource("CGMES input file(s)",
                 new ResourceSet("/issues/operational-limits/",
                         "limitsets_associated_to_equipments_EQ.xml",
-                        "limitsets_associated_to_equipments_EQBD.xml"));
+                        "limitsets_associated_to_equipments_EQBD.xml",
+                        "limitsets_associated_to_equipments_TPBD.xml"));
         Network network = Network.read(ds, new Properties());
 
         // OperationalLimitSet on dangling line is imported on its single extremity.
diff --git a/cgmes/cgmes-conversion/src/test/resources/issues/operational-limits/limitsets_associated_to_equipments_EQ.xml b/cgmes/cgmes-conversion/src/test/resources/issues/operational-limits/limitsets_associated_to_equipments_EQ.xml
index 6e3c1584327..4078878421f 100644
--- a/cgmes/cgmes-conversion/src/test/resources/issues/operational-limits/limitsets_associated_to_equipments_EQ.xml
+++ b/cgmes/cgmes-conversion/src/test/resources/issues/operational-limits/limitsets_associated_to_equipments_EQ.xml
@@ -1,5 +1,5 @@
 <rdf:RDF xmlns:cim="http://iec.ch/TC57/2013/CIM-schema-cim16#" xmlns:entsoe="http://entsoe.eu/CIM/SchemaExtension/3/1#" xmlns:md="http://iec.ch/TC57/61970-552/ModelDescription/1#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<md:FullModel rdf:about="urn:uuid:ModelID">
+<md:FullModel rdf:about="urn:uuid:ModelID_EQ">
     <md:Model.scenarioTime>2021-03-01T23:00:00Z</md:Model.scenarioTime>
     <md:Model.created>2021-03-02T10:22:58Z</md:Model.created>
     <md:Model.description>Limitsets refering equipments</md:Model.description>
diff --git a/cgmes/cgmes-conversion/src/test/resources/issues/operational-limits/limitsets_associated_to_equipments_EQBD.xml b/cgmes/cgmes-conversion/src/test/resources/issues/operational-limits/limitsets_associated_to_equipments_EQBD.xml
index 3381824f48c..f84faaf70dd 100644
--- a/cgmes/cgmes-conversion/src/test/resources/issues/operational-limits/limitsets_associated_to_equipments_EQBD.xml
+++ b/cgmes/cgmes-conversion/src/test/resources/issues/operational-limits/limitsets_associated_to_equipments_EQBD.xml
@@ -1,5 +1,5 @@
 <rdf:RDF xmlns:cim="http://iec.ch/TC57/2013/CIM-schema-cim16#" xmlns:entsoe="http://entsoe.eu/CIM/SchemaExtension/3/1#" xmlns:md="http://iec.ch/TC57/61970-552/ModelDescription/1#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<md:FullModel rdf:about="urn:uuid:ModelID">
+<md:FullModel rdf:about="urn:uuid:ModelID_EQBD">
     <md:Model.scenarioTime>2021-03-01T23:00:00Z</md:Model.scenarioTime>
     <md:Model.created>2021-03-02T10:22:58Z</md:Model.created>
     <md:Model.description>Limitsets refering equipments</md:Model.description>
@@ -14,6 +14,7 @@
 </cim:Line>
 <cim:ConnectivityNode rdf:ID="_CN_X">
     <cim:IdentifiedObject.name>X Node</cim:IdentifiedObject.name>
+    <entsoe:ConnectivityNode.boundaryPoint>true</entsoe:ConnectivityNode.boundaryPoint>
     <cim:ConnectivityNode.ConnectivityNodeContainer rdf:resource="#_LN"/>
 </cim:ConnectivityNode>
 </rdf:RDF>
diff --git a/cgmes/cgmes-conversion/src/test/resources/issues/operational-limits/limitsets_associated_to_equipments_TPBD.xml b/cgmes/cgmes-conversion/src/test/resources/issues/operational-limits/limitsets_associated_to_equipments_TPBD.xml
new file mode 100644
index 00000000000..8ccb794ead4
--- /dev/null
+++ b/cgmes/cgmes-conversion/src/test/resources/issues/operational-limits/limitsets_associated_to_equipments_TPBD.xml
@@ -0,0 +1,16 @@
+<rdf:RDF xmlns:cim="http://iec.ch/TC57/2013/CIM-schema-cim16#" xmlns:entsoe="http://entsoe.eu/CIM/SchemaExtension/3/1#" xmlns:md="http://iec.ch/TC57/61970-552/ModelDescription/1#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<md:FullModel rdf:about="urn:uuid:ModelID_TPBD">
+    <md:Model.scenarioTime>2021-03-01T23:00:00Z</md:Model.scenarioTime>
+    <md:Model.created>2021-03-02T10:22:58Z</md:Model.created>
+    <md:Model.description>Limitsets refering equipments</md:Model.description>
+    <md:Model.version>001</md:Model.version>
+    <md:Model.profile>http://entsoe.eu/CIM/TopologyBoundary/3/1</md:Model.profile>
+    <md:Model.modelingAuthoritySet>powsybl.org</md:Model.modelingAuthoritySet>
+</md:FullModel>
+<cim:ConnectivityNode rdf:about="#_CN_X">
+     <cim:ConnectivityNode.TopologicalNode rdf:resource="#_TN_X" />
+</cim:ConnectivityNode>
+<cim:TopologicalNode rdf:ID="_TN_X">
+    <cim:IdentifiedObject.name>Topological node</cim:IdentifiedObject.name>
+</cim:TopologicalNode>
+</rdf:RDF>