diff --git a/tests/integration/targets/vyos_l3_interfaces/tests/cli/_remove_config.yaml b/tests/integration/targets/vyos_l3_interfaces/tests/cli/_remove_config.yaml
index 0a59319a..26dbfc37 100644
--- a/tests/integration/targets/vyos_l3_interfaces/tests/cli/_remove_config.yaml
+++ b/tests/integration/targets/vyos_l3_interfaces/tests/cli/_remove_config.yaml
@@ -1,18 +1,18 @@
 ---
 - name: Remove Config
   vars:
-    lines: "delete interfaces ethernet \"{{ intf }}\" address\ndelete interfaces ethernet \"{{ intf }}\" vif\n"
+    lines: "delete interfaces ethernet \"{{ intf }}\" address\ndelete interfaces ethernet \"{{ intf }}\" vif\ndelete interfaces ethernet \"{{ intf }}\" ipv6\n"
   loop:
     - eth1
     - eth2
   loop_control:
     loop_var: intf
   ansible.netcommon.cli_config:
     config: "{{ lines }}"
 
 - name: Reset eth0 ipv6 autoconf
   vars:
     lines: |-
       delete interfaces ethernet eth0 ipv6 address autoconf
   ansible.netcommon.cli_config:
     config: "{{ lines }}"
diff --git a/tests/integration/targets/vyos_l3_interfaces/tests/cli/replaced.yaml b/tests/integration/targets/vyos_l3_interfaces/tests/cli/replaced.yaml
index 502175fc..9c33f7af 100644
--- a/tests/integration/targets/vyos_l3_interfaces/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_l3_interfaces/tests/cli/replaced.yaml
@@ -1,50 +1,89 @@
 ---
 - debug:
     msg: START vyos_l3_interfaces replaced integration tests on connection={{ ansible_connection }}
 
 - include_tasks: _populate.yaml
 
 - block:
     - name: Replace device configurations of listed interfaces with provided configurations
       register: result
       vyos.vyos.vyos_l3_interfaces: &id001
         config:
           - name: eth1
             ipv4:
               - address: 192.0.2.19/24
 
           - name: eth2
             ipv6:
               - address: 2001:db8::11/32
         state: replaced
 
     - name: Assert that correct set of commands were generated
       assert:
         that:
           - "{{ replaced['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
 
     - name: Assert that before dicts are correctly generated
       assert:
         that:
           - "{{ populate | symmetric_difference(result['before']) |length == 0 }}"
 
     - name: Assert that after dict is correctly generated
       assert:
         that:
           - "{{ replaced['after'] | symmetric_difference(result['after']) |length == 0 }}"
 
     - name: Replace device configurations of listed interfaces with provided configurarions (IDEMPOTENT)
       register: result
       vyos.vyos.vyos_l3_interfaces: *id001
 
     - name: Assert that task was idempotent
       assert:
         that:
           - result['changed'] == false
 
     - name: Assert that before dict is correctly generated
       assert:
         that:
           - "{{ replaced['after'] | symmetric_difference(result['before']) |length == 0 }}"
+
+    - name: Replace device configurations (autoconf)
+      register: result
+      vyos.vyos.vyos_l3_interfaces: &id002
+        config:
+          - name: eth2
+            ipv6:
+              - address: auto-config
+        state: replaced
+
+    - name: Assert that correct set of commands were generated (autoconf)
+      assert:
+        that:
+          - "{{ replaced['af_commands'] | symmetric_difference(result['commands']) |length == 0 }}"
+
+    - name: Assert that before dict is correctly generated (autoconf)
+      assert:
+        that:
+          - "{{ replaced['after'] | symmetric_difference(result['before']) |length == 0 }}"
+
+    - name: Assert that after dict is correctly generated
+      assert:
+        that:
+          - "{{ replaced['af_after'] | symmetric_difference(result['after']) |length == 0 }}"
+
+    - name: Replace device autoconf configurations (IDEMPOTENT)
+      register: result
+      vyos.vyos.vyos_l3_interfaces: *id002
+
+    - name: Assert that task was idempotent (autoconf)
+      assert:
+        that:
+          - result['changed'] == false
+
+    - name: Assert that before dict is correctly generated (autoconf)
+      assert:
+        that:
+          - "{{ replaced['af_after'] | symmetric_difference(result['before']) |length == 0 }}"
+
   always:
     - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_l3_interfaces/vars/main.yaml b/tests/integration/targets/vyos_l3_interfaces/vars/main.yaml
index 8f39db03..9a65e1d4 100644
--- a/tests/integration/targets/vyos_l3_interfaces/vars/main.yaml
+++ b/tests/integration/targets/vyos_l3_interfaces/vars/main.yaml
@@ -1,121 +1,134 @@
 ---
 merged:
   before:
     - name: eth0
       ipv4:
         - address: dhcp
     - name: eth1
     - name: eth2
   commands:
     - set interfaces ethernet eth0 ipv6 address 'autoconf'
     - set interfaces ethernet eth1 address '192.0.2.10/24'
     - set interfaces ethernet eth1 address '2001:db8::10/32'
     - set interfaces ethernet eth2 address '198.51.100.10/24'
     - set interfaces ethernet eth2 vif 101 address '198.51.100.130/25'
     - set interfaces ethernet eth2 vif 101 address '2001:db8::20/32'
   after:
     - name: eth0
       ipv4:
         - address: dhcp
       ipv6:
         - address: autoconf
     - name: eth1
       ipv4:
         - address: 192.0.2.10/24
       ipv6:
         - address: 2001:db8::10/32
     - name: eth2
       ipv4:
         - address: 198.51.100.10/24
       vifs:
         - vlan_id: 101
           ipv4:
             - address: 198.51.100.130/25
           ipv6:
             - address: 2001:db8::20/32
 populate:
   - name: eth1
     ipv4:
       - address: 192.0.2.14/24
   - name: eth2
     ipv4:
       - address: 192.0.2.10/24
       - address: 192.0.2.11/24
     ipv6:
       - address: 2001:db8::10/32
       - address: 2001:db8::12/32
   - name: eth0
     ipv4:
       - address: dhcp
 replaced:
   commands:
     - delete interfaces ethernet eth2 address '192.0.2.10/24'
     - delete interfaces ethernet eth2 address '192.0.2.11/24'
     - delete interfaces ethernet eth2 address '2001:db8::10/32'
     - delete interfaces ethernet eth2 address '2001:db8::12/32'
     - set interfaces ethernet eth2 address '2001:db8::11/32'
     - delete interfaces ethernet eth1 address '192.0.2.14/24'
     - set interfaces ethernet eth1 address '192.0.2.19/24'
+  af_commands:
+    - delete interfaces ethernet eth2 address '2001:db8::11/32'
+    - set interfaces ethernet eth2 ipv6 address 'autoconf'
   after:
     - name: eth2
       ipv6:
         - address: 2001:db8::11/32
     - name: eth1
       ipv4:
         - address: 192.0.2.19/24
     - name: eth0
       ipv4:
         - address: dhcp
+  af_after:
+    - name: eth2
+      ipv6:
+        - address: autoconf
+    - name: eth1
+      ipv4:
+        - address: 192.0.2.19/24
+    - name: eth0
+      ipv4:
+        - address: dhcp
 overridden:
   commands:
     - delete interfaces ethernet eth1 address '192.0.2.14/24'
     - set interfaces ethernet eth1 address '192.0.2.15/24'
     - delete interfaces ethernet eth2 address '192.0.2.10/24'
     - delete interfaces ethernet eth2 address '192.0.2.11/24'
     - delete interfaces ethernet eth2 address '2001:db8::10/32'
     - delete interfaces ethernet eth2 address '2001:db8::12/32'
   after:
     - name: eth0
       ipv4:
         - address: dhcp
     - name: eth1
       ipv4:
         - address: 192.0.2.15/24
     - name: eth2
 parsed:
   after:
     - name: eth1
       ipv4:
         - address: 192.0.2.10/24
       ipv6:
         - address: 2001:db8::10/32
     - name: eth2
       ipv4:
         - address: 198.51.100.10/24
       vifs:
         - vlan_id: 101
           ipv4:
             - address: 198.51.100.130/25
           ipv6:
             - address: 2001:db8::20/32
 rendered:
   commands:
     - set interfaces ethernet eth1 address '192.0.2.14/24'
     - set interfaces ethernet eth2 address '192.0.2.11/24'
     - set interfaces ethernet eth2 address '192.0.2.10/24'
     - set interfaces ethernet eth2 address '2001:db8::10/32'
     - set interfaces ethernet eth2 address '2001:db8::12/32'
 
 deleted:
   commands:
     - delete interfaces ethernet eth1 address '192.0.2.14/24'
     - delete interfaces ethernet eth2 address '192.0.2.10/24'
     - delete interfaces ethernet eth2 address '192.0.2.11/24'
     - delete interfaces ethernet eth2 address '2001:db8::10/32'
     - delete interfaces ethernet eth2 address '2001:db8::12/32'
   after:
     - name: eth0
       ipv4:
         - address: dhcp
     - name: eth1
     - name: eth2