diff --git a/src/blenderbim/test/tool/test_system.py b/src/blenderbim/test/tool/test_system.py
index d10817068e..605e1204c6 100644
--- a/src/blenderbim/test/tool/test_system.py
+++ b/src/blenderbim/test/tool/test_system.py
@@ -20,8 +20,11 @@ import bpy
 import ifcopenshell
 import blenderbim.core.tool
 import blenderbim.tool as tool
+import numpy as np
 from test.bim.bootstrap import NewFile
 from blenderbim.tool.system import System as subject
+from mathutils import Euler, Vector, Matrix
+from math import pi
 
 
 class TestImplementsTool(NewFile):
@@ -29,6 +32,59 @@ class TestImplementsTool(NewFile):
         assert isinstance(subject(), blenderbim.core.tool.System)
 
 
+class TestAddPorts(NewFile):
+    def setup_mep_segment(self):
+        bpy.ops.bim.create_project()
+        bpy.ops.mesh.primitive_cube_add(size=1, location=(0, 0, 0))
+        obj = bpy.data.objects["Cube"]
+        obj.scale = (1, 1, 5)
+        bpy.ops.bim.assign_class(ifc_class="IfcDuctSegment", predefined_type="RIGIDSEGMENT", userdefined_type="")
+        element = tool.Ifc.get_entity(obj)
+        obj.matrix_world = Euler((pi / 2, 0, pi / 2)).to_matrix().to_4x4() @ obj.matrix_world
+        # move origin
+        for v in obj.data.vertices:
+            v.co += Vector((0, 0, 2.5))
+        return obj, element
+
+    def check_ports_matrices(self, ports, expected_matrices):
+        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+        for port, expected_matrix in zip(ports, expected_matrices, strict=True):
+            port_matrix = tool.Model.get_element_matrix(port)
+            port_matrix.translation *= si_conversion
+            assert np.allclose(port_matrix, expected_matrix, atol=1.0e-5)
+
+    def test_run(self):
+        # default use
+        obj, element = self.setup_mep_segment()
+        ports = subject.add_ports(obj)
+        assert len(subject.get_ports(element)) == len(ports)
+        self.check_ports_matrices(ports, (obj.matrix_world, obj.matrix_world @ Matrix.Translation((0, 0, 5))))
+
+        # skip end port
+        obj, element = self.setup_mep_segment()
+        ports = subject.add_ports(obj, add_end_port=False)
+        self.check_ports_matrices(ports, (obj.matrix_world,))
+
+        # skip start port
+        obj, element = self.setup_mep_segment()
+        ports = subject.add_ports(obj, add_start_port=False)
+        self.check_ports_matrices(ports, (obj.matrix_world @ Matrix.Translation((0, 0, 5)),))
+
+        # position end port
+        obj, element = self.setup_mep_segment()
+        ports = subject.add_ports(obj, end_port_pos=Vector((1, 2, 3)))
+        translated_matrix = obj.matrix_world.copy()
+        translated_matrix.translation = (1, 2, 3)
+        self.check_ports_matrices(ports, (obj.matrix_world, translated_matrix))
+
+        # offset end port
+        obj, element = self.setup_mep_segment()
+        ports = subject.add_ports(obj, offset_end_port=Vector((0, 0, 1)))
+        translated_matrix = obj.matrix_world.copy()
+        translated_matrix.translation = (5, 0, 1)
+        self.check_ports_matrices(ports, (obj.matrix_world, translated_matrix))
+
+
 class TestCreateEmptyAtCursorWithElementOrientation(NewFile):
     def test_run(self):
         ifc = ifcopenshell.file()