diff --git a/tests/integration/targets/vyos_vrf/tests/cli/gathered.old b/tests/integration/targets/vyos_vrf/tests/cli/gathered.yaml
similarity index 60%
rename from tests/integration/targets/vyos_vrf/tests/cli/gathered.old
rename to tests/integration/targets/vyos_vrf/tests/cli/gathered.yaml
index b2a0fa5e..8be29b3c 100644
--- a/tests/integration/targets/vyos_vrf/tests/cli/gathered.old
+++ b/tests/integration/targets/vyos_vrf/tests/cli/gathered.yaml
@@ -1,19 +1,19 @@
 ---
 - debug:
-    msg: START vyos_route_maps gathered integration tests on connection={{ ansible_connection }}
+    msg: START vyos_vrf gathered integration tests on connection={{ ansible_connection }}
 
 - include_tasks: _populate.yaml
 
 - block:
     - name: Gather config from the device in structured format.
       register: result
-      vyos.vyos.vyos_route_maps:
+      vyos.vyos.vyos_vrf:
         state: gathered
 
     - vyos.vyos.vyos_facts:
-        gather_network_resources: route_maps
+        gather_network_resources: vrf
 
     - assert:
         that:
           - result.changed == false
-          - result.gathered|symmetric_difference(ansible_facts['network_resources']['route_maps']) == []
+          - result.gathered|symmetric_difference(ansible_facts['network_resources']['vrf']) == []
diff --git a/tests/integration/targets/vyos_vrf/tests/cli/parsed.old b/tests/integration/targets/vyos_vrf/tests/cli/parsed.yaml
similarity index 70%
rename from tests/integration/targets/vyos_vrf/tests/cli/parsed.old
rename to tests/integration/targets/vyos_vrf/tests/cli/parsed.yaml
index c41b5130..2d563350 100644
--- a/tests/integration/targets/vyos_vrf/tests/cli/parsed.old
+++ b/tests/integration/targets/vyos_vrf/tests/cli/parsed.yaml
@@ -1,14 +1,14 @@
 ---
 - debug:
-    msg: START vyos_route_maps parsed integration tests on connection={{ ansible_connection }}
+    msg: START vyos_vrf parsed integration tests on connection={{ ansible_connection }}
 
 - name: Provide the running configuration for parsing (config to be parsed)
   register: result
-  vyos.vyos.vyos_route_maps:
+  vyos.vyos.vyos_vrf:
     running_config: "{{ lookup('file', '_parsed.cfg') }}"
     state: parsed
 
 - assert:
     that:
       - result.changed == false
       - result.parsed|symmetric_difference(merged.after) == []
diff --git a/tests/integration/targets/vyos_vrf/vars/main.yaml b/tests/integration/targets/vyos_vrf/vars/main.yaml
index 32401db3..d0f71d65 100644
--- a/tests/integration/targets/vyos_vrf/vars/main.yaml
+++ b/tests/integration/targets/vyos_vrf/vars/main.yaml
@@ -1,112 +1,112 @@
 ---
 merged:
   before:
     bind_to_all: false
   commands:
     - set vrf name vrf-green table 110
     - set vrf name vrf-green vni 1010
     - set vrf name vrf-green description green-vrf
-
   after:
-    - route_map: test3
-      entries:
-        - sequence: 1
-          action: permit
-          match:
-            metric: 1
-            peer: 192.0.2.32
-          set:
-            local_preference: "4"
-            metric: "5"
-            metric_type: type-1
-            origin: egp
-            originator_id: 192.0.2.34
-            tag: "5"
-            weight: "4"
-    - route_map: test1
-      entries:
-        - sequence: 1
-          description: test
-          action: permit
-          continue_sequence: 2
+    bind_to_all: true
+    instances:
+      - name: "vrf-blue"
+        description: "blue-vrf"
+        disable: false
+        table_id: 100
+        vni: 1000
+      - name: "vrf-red"
+        description: "red-vrf"
+        disable: true
+        table_id: 101
+        vni: 1001
+        address_family:
+          - afi: "ipv4"
+            disable_forwarding: true
+            route_maps:
+              - rm_name: "rm1"
+                protocol: "kernel"
+              - rm_name: "rm1"
+                protocol: "rip"
+          - afi: "ipv6"
+            nht_no_resolve_via_default: true
 
 replaced:
   commands:
     - delete vrf bind-to-all
     - set vrf name vrf-blue disable
     - set vrf name vrf-red vni 1011
     - set vrf name vrf-red description Vermillion_VRF
     - delete vrf name vrf-red disable
     - delete vrf name vrf-red ipv6 nht no-resolve-via-default
   after:
     - route_map: test2
       entries:
         - sequence: 1
           description: test
           action: permit
         - sequence: 1
           action: permit
           on_match:
             goto: 4
     - route_map: test3
       entries:
         - sequence: 1
           action: permit
           match:
             metric: 3
             peer: 192.0.2.35
           set:
             local_preference: 6
             metric: 4
             metric_type: type-1
             origin: egp
             originator_id: 192.0.2.34
             tag: 4
             weight: 4
 
 overridden:
   commands:
     - delete policy route-map test2
     - delete policy route-map test3 rule 1 set ip-next-hop 192.0.2.33
     - set policy route-map test3 rule 1 set local-preference 6
     - set policy route-map test3 rule 1 set metric 4
     - set policy route-map test3 rule 1 set tag 4
     - delete policy route-map test3 rule 1 set community none
     - set policy route-map test3 rule 1 match metric 3
     - set policy route-map test3 rule 1 match peer 192.0.2.35
   after:
     - route_map: test3
       entries:
         - sequence: 1
           action: permit
           match:
             metric: 3
             peer: 192.0.2.35
           set:
             local_preference: 6
             metric: 4
             metric_type: type-1
             origin: egp
             originator_id: 192.0.2.34
             tag: 4
             weight: 4
 
 deleted:
   commands:
     - delete policy route-map test2
     - delete policy route-map test3
   after: []
 
 populate_config:
   - set vrf bind-to-all
   - set vrf name vrf-blue description 'blue-vrf'
   - set vrf name vrf-blue table '100'
   - set vrf name vrf-blue vni '1000'
   - set vrf name vrf-red description 'red-vrf'
   - set vrf name vrf-red disable
   - set vrf name vrf-red ip disable-forwarding
   - set vrf name vrf-red ip protocol kernel route-map 'rm1'
   - set vrf name vrf-red ip protocol rip route-map 'rm1'
   - set vrf name vrf-red ipv6 nht no-resolve-via-default
   - set vrf name vrf-red table '101'
   - set vrf name vrf-red vni '1001'