diff --git a/test/workflows/nren_l3_core_service/test_modify_nren_l3_core_service.py b/test/workflows/nren_l3_core_service/test_modify_nren_l3_core_service.py
index 86831534e7eb2d34ecc16b5a8fbd1a5e0e786198..197be36c55baf085b5d624bd9bcee8946c7c157e 100644
--- a/test/workflows/nren_l3_core_service/test_modify_nren_l3_core_service.py
+++ b/test/workflows/nren_l3_core_service/test_modify_nren_l3_core_service.py
@@ -92,15 +92,10 @@ def test_modify_nren_l3_core_service_add_new_edge_port_success(
     assert len(subscription.nren_l3_core_service.nren_ap_list) == 3
 
 
-@pytest.mark.parametrize("l3_core_service_type", [NRENL3CoreServiceType.GEANT_IP, NRENL3CoreServiceType.IAS])
-@pytest.mark.workflow()
-def test_modify_nren_l3_core_service_modify_edge_port_success(
-    faker, nren_l3_core_service_subscription_factory, l3_core_service_type
-):
-    subscription_id = nren_l3_core_service_subscription_factory(nren_l3_core_service_type=l3_core_service_type)
-    subscription = NRENL3CoreService.from_subscription(subscription_id)
-    new_sbp_data = [
-        {
+@pytest.fixture()
+def sbp_input_form_data(faker):
+    def _generate_form_data():
+        return {
             "geant_sid": faker.geant_sid(),
             "is_tagged": True,
             "vlan_id": faker.vlan_id(),
@@ -131,41 +126,19 @@ def test_modify_nren_l3_core_service_modify_edge_port_success(
                 "peer_address": faker.ipv6(),
                 "add_v6_multicast": True,
             },
-        },
-        {
-            "geant_sid": faker.geant_sid(),
-            "is_tagged": True,
-            "vlan_id": faker.vlan_id(),
-            "ipv4_address": faker.ipv4(),
-            "ipv6_address": faker.ipv6(),
-            "custom_firewall_filters": True,
-            "v4_bgp_peer": {
-                "bfd_enabled": True,
-                "bfd_interval": faker.pyint(),
-                "bfd_multiplier": faker.pyint(),
-                "has_custom_policies": True,
-                "authentication_key": faker.password(),
-                "multipath_enabled": True,
-                "send_default_route": True,
-                "is_passive": True,
-                "peer_address": faker.ipv4(),
-                "add_v4_multicast": True,
-            },
-            "v6_bgp_peer": {
-                "bfd_enabled": True,
-                "bfd_interval": faker.pyint(),
-                "bfd_multiplier": faker.pyint(),
-                "has_custom_policies": True,
-                "authentication_key": faker.password(),
-                "multipath_enabled": True,
-                "send_default_route": True,
-                "is_passive": True,
-                "peer_address": faker.ipv6(),
-                "add_v6_multicast": True,
-            },
-        },
-    ]
+        }
+
+    return _generate_form_data
+
 
+@pytest.mark.parametrize("l3_core_service_type", [NRENL3CoreServiceType.GEANT_IP, NRENL3CoreServiceType.IAS])
+@pytest.mark.workflow()
+def test_modify_nren_l3_core_service_modify_edge_port_success(
+    faker, nren_l3_core_service_subscription_factory, l3_core_service_type, sbp_input_form_data
+):
+    subscription_id = nren_l3_core_service_subscription_factory(nren_l3_core_service_type=l3_core_service_type)
+    subscription = NRENL3CoreService.from_subscription(subscription_id)
+    new_sbp_data = [sbp_input_form_data(), sbp_input_form_data()]
     input_form_data = [
         {"subscription_id": subscription_id},
         {