diff --git a/test/integration/targets/nxos_lag_interfaces/tests/cli/deleted.yaml b/test/integration/targets/nxos_lag_interfaces/tests/cli/deleted.yaml
index ad4ac416e8f..265e5184bf8 100644
--- a/test/integration/targets/nxos_lag_interfaces/tests/cli/deleted.yaml
+++ b/test/integration/targets/nxos_lag_interfaces/tests/cli/deleted.yaml
@@ -10,14 +10,8 @@
     feature: lacp
 
 - name: Setup1
-  nxos_config:
-    lines:
-      - "no channel-group 10"
-    parents: "{{ item }}"
-  ignore_errors: yes
-  loop:
-    - "interface {{ test_int1 }}"
-    - "interface {{ test_int2 }}"
+  nxos_lag_interfaces: &remove_lags
+    state: deleted
 
 - block:
   - name: Setup2
@@ -63,14 +57,8 @@
 
   always:
   - name: Teardown
-    nxos_config:
-      lines:
-        - "no channel-group 10"
-      parents: "{{ item }}"
+    nxos_lag_interfaces: *remove_lags
     ignore_errors: yes
-    loop:
-      - "interface {{ test_int1 }}"
-      - "interface {{ test_int2 }}"
 
   - name: disable feature lacp
     nxos_feature:
diff --git a/test/integration/targets/nxos_lag_interfaces/tests/cli/merged.yaml b/test/integration/targets/nxos_lag_interfaces/tests/cli/merged.yaml
index 4ebd1d7a6aa..f52a7a4fc2d 100644
--- a/test/integration/targets/nxos_lag_interfaces/tests/cli/merged.yaml
+++ b/test/integration/targets/nxos_lag_interfaces/tests/cli/merged.yaml
@@ -12,12 +12,12 @@
 - name: Setup
   nxos_config:
     lines:
-      - "no channel-group"
-    parents: "{{ item }}"
+      - no interface port-channel 10
   ignore_errors: yes
-  loop:
-    - "interface {{ test_int1 }}"
-    - "interface {{ test_int2 }}"
+
+- name: setup2
+  nxos_lag_interfaces: &remove_lags
+    state: deleted
 
 - block:
   - name: Merged
@@ -56,14 +56,8 @@
 
   always:
   - name: Teardown
-    nxos_config:
-      lines:
-        - "no channel-group"
-      parents: "{{ item }}"
+    nxos_lag_interfaces: *remove_lags
     ignore_errors: yes
-    loop:
-      - "interface {{ test_int1 }}"
-      - "interface {{ test_int2 }}"
 
   - name: Disable feature lacp
     nxos_feature:
diff --git a/test/integration/targets/nxos_lag_interfaces/tests/cli/overridden.yaml b/test/integration/targets/nxos_lag_interfaces/tests/cli/overridden.yaml
index 44bdff0145e..f8aa1ca8c41 100644
--- a/test/integration/targets/nxos_lag_interfaces/tests/cli/overridden.yaml
+++ b/test/integration/targets/nxos_lag_interfaces/tests/cli/overridden.yaml
@@ -13,19 +13,13 @@
 - name: setup1
   nxos_config:
     lines:
-      - "no channel-group 10"
-    parents: "{{ item }}"
+      - no interface port-channel 10
+      - no interface port-channel 19
   ignore_errors: yes
-  loop:
-    - "interface {{ test_int1 }}"
-    - "interface {{ test_int2 }}"
 
 - name: setup2
-  nxos_config: &cleanup2
-    lines:
-      - "no channel-group 19"
-    parents: "interface {{ test_int3 }}"
-  ignore_errors: yes
+  nxos_lag_interfaces: &remove_lags
+    state: deleted
 
 - block:
   - name: setup3
@@ -74,18 +68,8 @@
       that:
         - "result.changed == false"
   always:
-  - name: teardown1
-    nxos_config:
-      lines:
-        - "no channel-group 10"
-      parents: "{{ item }}"
-    ignore_errors: yes
-    loop:
-      - "interface {{ test_int1 }}"
-      - "interface {{ test_int2 }}"
-
-  - name: teardown2
-    nxos_config: *cleanup2
+  - name: Teardown
+    nxos_lag_interfaces: *remove_lags
     ignore_errors: yes
 
   - name: disable feature lacp
diff --git a/test/integration/targets/nxos_lag_interfaces/tests/cli/replaced.yaml b/test/integration/targets/nxos_lag_interfaces/tests/cli/replaced.yaml
index 6393da7045a..51032d9fb98 100644
--- a/test/integration/targets/nxos_lag_interfaces/tests/cli/replaced.yaml
+++ b/test/integration/targets/nxos_lag_interfaces/tests/cli/replaced.yaml
@@ -10,18 +10,15 @@
     feature: lacp
 
 - name: setup1
-  nxos_config: &cleanup1
+  nxos_config:
     lines:
-      - "no channel-group 10"
-    parents: "interface {{ test_int1 }}"
+      - no interface port-channel 10
+      - no interface port-channel 11
   ignore_errors: yes
 
 - name: setup2
-  nxos_config: &cleanup2
-    lines:
-      - "no channel-group 11"
-    parents: "interface {{ test_int2 }}"
-  ignore_errors: yes
+  nxos_lag_interfaces: &remove_lags
+    state: deleted
 
 - block:
   - name: setup3
@@ -72,11 +69,7 @@
 
   always:
   - name: teardown1
-    nxos_config: *cleanup1
-    ignore_errors: yes
-
-  - name: teardown2
-    nxos_config: *cleanup2
+    nxos_lag_interfaces: *remove_lags
     ignore_errors: yes
 
   - name: disable feature lacp