diff --git a/changelogs/fragments/T7012_ospfv3_integration_tests.yaml b/changelogs/fragments/T7012_ospfv3_integration_tests.yaml
new file mode 100644
index 00000000..b8f1f8b3
--- /dev/null
+++ b/changelogs/fragments/T7012_ospfv3_integration_tests.yaml
@@ -0,0 +1,3 @@
+---
+trivial:
+  - vyos_ospfv2 - fix intergration test suite.
diff --git a/tests/integration/targets/vyos_ospfv3/tests/cli/_populate.yaml b/tests/integration/targets/vyos_ospfv3/tests/cli/_populate.yaml
index c484a7fb..3800c52c 100644
--- a/tests/integration/targets/vyos_ospfv3/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_ospfv3/tests/cli/_populate.yaml
@@ -1,16 +1,8 @@
 ---
 - ansible.builtin.include_tasks: _remove_config.yaml
 
 - name: Setup
+  vyos.vyos.vyos_config:
+    lines: "{{ populate_commands }}"
   vars:
-    lines: >-
-      "set protocols ospfv3 area 2 export-list 'export1'
-      \n set protocols ospfv3 area 2 import-list 'import1'
-      \n set protocols ospfv3 area 2 range '2001:db10::/32'
-      \n set protocols ospfv3 area 2 range '2001:db20::/32'
-      \n set protocols ospfv3 area 2 range '2001:db30::/32'
-      \n set protocols ospfv3 area 3 range '2001:db40::/32'
-      \n set protocols ospfv3 parameters router-id '192.0.2.10'
-      \n set protocols ospfv3 redistribute 'bgp'"
-  ansible.netcommon.cli_config:
-    config: "{{ lines }}"
+    ansible_connection: ansible.netcommon.network_cli
diff --git a/tests/integration/targets/vyos_ospfv3/vars/main.yaml b/tests/integration/targets/vyos_ospfv3/vars/main.yaml
index 21fce2dc..6226579e 100644
--- a/tests/integration/targets/vyos_ospfv3/vars/main.yaml
+++ b/tests/integration/targets/vyos_ospfv3/vars/main.yaml
@@ -1,141 +1,152 @@
 ---
 merged:
   before: {}
   commands:
     - set protocols ospfv3 redistribute bgp
     - set protocols ospfv3 parameters router-id '192.0.2.10'
     - set protocols ospfv3 area 2 range 2001:db10::/32
     - set protocols ospfv3 area 2 range 2001:db20::/32
     - set protocols ospfv3 area 2 range 2001:db30::/32
     - set protocols ospfv3 area '2'
     - set protocols ospfv3 area 2 export-list export1
     - set protocols ospfv3 area 2 import-list import1
     - set protocols ospfv3 area '3'
     - set protocols ospfv3 area 3 range 2001:db40::/32
   after:
     areas:
       - area_id: "2"
         export_list: export1
         import_list: import1
         range:
           - address: 2001:db10::/32
           - address: 2001:db20::/32
           - address: 2001:db30::/32
       - area_id: "3"
         range:
           - address: 2001:db40::/32
     parameters:
       router_id: 192.0.2.10
     redistribute:
       - route_type: bgp
 
 merged_update:
   commands:
     - set protocols ospfv3 area 3 range 2001:db70::/32
   after:
     areas:
       - area_id: "2"
         export_list: export1
         import_list: import1
         range:
           - address: 2001:db10::/32
           - address: 2001:db20::/32
           - address: 2001:db30::/32
       - area_id: "3"
         range:
           - address: 2001:db40::/32
           - address: 2001:db70::/32
     parameters:
       router_id: 192.0.2.10
     redistribute:
       - route_type: bgp
 
 populate:
   areas:
     - area_id: "2"
       export_list: export1
       import_list: import1
       range:
         - address: 2001:db10::/32
         - address: 2001:db20::/32
         - address: 2001:db30::/32
     - area_id: "3"
       range:
         - address: 2001:db40::/32
   parameters:
     router_id: 192.0.2.10
   redistribute:
     - route_type: bgp
+
+populate_commands:
+  - set protocols ospfv3 area 2 export-list 'export1'
+  - set protocols ospfv3 area 2 import-list 'import1'
+  - set protocols ospfv3 area 2 range '2001:db10::/32'
+  - set protocols ospfv3 area 2 range '2001:db20::/32'
+  - set protocols ospfv3 area 2 range '2001:db30::/32'
+  - set protocols ospfv3 area 3 range '2001:db40::/32'
+  - set protocols ospfv3 parameters router-id '192.0.2.10'
+  - set protocols ospfv3 redistribute 'bgp'
+
 replaced:
   commands:
     - delete protocols ospfv3 area 2 range 2001:db20::/32
     - delete protocols ospfv3 area 3
     - set protocols ospfv3 area 2 range 2001:db50::/32
     - set protocols ospfv3 area '4'
     - set protocols ospfv3 area 4 range 2001:db60::/32
   after:
     areas:
       - area_id: "2"
         export_list: export1
         import_list: import1
         range:
           - address: 2001:db10::/32
           - address: 2001:db30::/32
           - address: 2001:db50::/32
       - area_id: "4"
         range:
           - address: 2001:db60::/32
     parameters:
       router_id: 192.0.2.10
     redistribute:
       - route_type: bgp
 rendered:
   commands:
     - set protocols ospfv3 redistribute bgp
     - set protocols ospfv3 parameters router-id '192.0.2.10'
     - set protocols ospfv3 area 2 range 2001:db10::/32
     - set protocols ospfv3 area 2 range 2001:db20::/32
     - set protocols ospfv3 area 2 range 2001:db30::/32
     - set protocols ospfv3 area '2'
     - set protocols ospfv3 area 2 export-list export1
     - set protocols ospfv3 area 2 import-list import1
     - set protocols ospfv3 area '3'
     - set protocols ospfv3 area 3 range 2001:db40::/32
 parsed:
   after:
     areas:
       - area_id: "2"
         export_list: export1
         import_list: import1
         range:
           - address: 2001:db10::/32
           - address: 2001:db20::/32
           - address: 2001:db30::/32
       - area_id: "3"
         range:
           - address: 2001:db40::/32
     parameters:
       router_id: 192.0.2.10
     redistribute:
       - route_type: bgp
 deleted:
   commands:
     - delete protocols ospfv3
   after: {}
 round_trip:
   after:
     areas:
       - area_id: "2"
         export_list: export1
         import_list: import1
         range:
           - address: 2001:db10::/32
           - address: 2001:db30::/32
           - address: 2001:db50::/32
       - area_id: "4"
         range:
           - address: 2001:db60::/32
     parameters:
       router_id: 192.0.2.10
     redistribute:
       - route_type: bgp