diff --git a/test/integration/targets/nxos_hsrp/tests/cli/sanity.yaml b/test/integration/targets/nxos_hsrp/tests/cli/sanity.yaml
deleted file mode 100644
index 413b3df3ac..0000000000
--- a/test/integration/targets/nxos_hsrp/tests/cli/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ cli }}"
-
-- import_tasks: targets/nxos_hsrp/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_hsrp/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_hsrp/tests/nxapi/sanity.yaml
deleted file mode 100644
index 7718b7c858..0000000000
--- a/test/integration/targets/nxos_hsrp/tests/nxapi/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ nxapi }}"
-
-- import_tasks: targets/nxos_hsrp/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_ntp/tests/cli/sanity.yaml b/test/integration/targets/nxos_ntp/tests/cli/sanity.yaml
deleted file mode 100644
index c28f9d6145..0000000000
--- a/test/integration/targets/nxos_ntp/tests/cli/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ cli }}"
-
-- import_tasks: targets/nxos_ntp/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_ntp/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_ntp/tests/nxapi/sanity.yaml
deleted file mode 100644
index 7e6a8bd9db..0000000000
--- a/test/integration/targets/nxos_ntp/tests/nxapi/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ nxapi }}"
-
-- import_tasks: targets/nxos_ntp/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_ospf_vrf/tests/cli/sanity.yaml b/test/integration/targets/nxos_ospf_vrf/tests/cli/sanity.yaml
deleted file mode 100644
index 57109695e4..0000000000
--- a/test/integration/targets/nxos_ospf_vrf/tests/cli/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ cli }}"
-
-- import_tasks: targets/nxos_ospf_vrf/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_ospf_vrf/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_ospf_vrf/tests/nxapi/sanity.yaml
deleted file mode 100644
index 1c3f845c16..0000000000
--- a/test/integration/targets/nxos_ospf_vrf/tests/nxapi/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ nxapi }}"
-
-- import_tasks: targets/nxos_ospf_vrf/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_overlay_global/tests/cli/sanity.yaml b/test/integration/targets/nxos_overlay_global/tests/cli/sanity.yaml
deleted file mode 100644
index 420af7420e..0000000000
--- a/test/integration/targets/nxos_overlay_global/tests/cli/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ cli }}"
-
-- import_tasks: "{{ role_path }}/tests/common/sanity.yaml"
diff --git a/test/integration/targets/nxos_overlay_global/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_overlay_global/tests/nxapi/sanity.yaml
deleted file mode 100644
index e30ea6eaf7..0000000000
--- a/test/integration/targets/nxos_overlay_global/tests/nxapi/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ nxapi }}"
-
-- import_tasks: "{{ role_path }}/tests/common/sanity.yaml"
diff --git a/test/integration/targets/nxos_pim_interface/tests/cli/sanity.yaml b/test/integration/targets/nxos_pim_interface/tests/cli/sanity.yaml
deleted file mode 100644
index 420af7420e..0000000000
--- a/test/integration/targets/nxos_pim_interface/tests/cli/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ cli }}"
-
-- import_tasks: "{{ role_path }}/tests/common/sanity.yaml"
diff --git a/test/integration/targets/nxos_pim_interface/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_pim_interface/tests/nxapi/sanity.yaml
deleted file mode 100644
index e30ea6eaf7..0000000000
--- a/test/integration/targets/nxos_pim_interface/tests/nxapi/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ nxapi }}"
-
-- import_tasks: "{{ role_path }}/tests/common/sanity.yaml"
diff --git a/test/integration/targets/nxos_snapshot/tests/cli/sanity.yaml b/test/integration/targets/nxos_snapshot/tests/cli/sanity.yaml
deleted file mode 100644
index b73edf246d..0000000000
--- a/test/integration/targets/nxos_snapshot/tests/cli/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ cli }}"
-
-- import_tasks: targets/nxos_snapshot/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_snapshot/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_snapshot/tests/nxapi/sanity.yaml
deleted file mode 100644
index a13de83ac7..0000000000
--- a/test/integration/targets/nxos_snapshot/tests/nxapi/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ nxapi }}"
-
-- import_tasks: targets/nxos_snapshot/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_snmp_community/tests/cli/sanity.yaml b/test/integration/targets/nxos_snmp_community/tests/cli/sanity.yaml
deleted file mode 100644
index 420af7420e..0000000000
--- a/test/integration/targets/nxos_snmp_community/tests/cli/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ cli }}"
-
-- import_tasks: "{{ role_path }}/tests/common/sanity.yaml"
diff --git a/test/integration/targets/nxos_snmp_community/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_snmp_community/tests/nxapi/sanity.yaml
deleted file mode 100644
index e30ea6eaf7..0000000000
--- a/test/integration/targets/nxos_snmp_community/tests/nxapi/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ nxapi }}"
-
-- import_tasks: "{{ role_path }}/tests/common/sanity.yaml"
diff --git a/test/integration/targets/nxos_snmp_location/tests/cli/sanity.yaml b/test/integration/targets/nxos_snmp_location/tests/cli/sanity.yaml
deleted file mode 100644
index 420af7420e..0000000000
--- a/test/integration/targets/nxos_snmp_location/tests/cli/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ cli }}"
-
-- import_tasks: "{{ role_path }}/tests/common/sanity.yaml"
diff --git a/test/integration/targets/nxos_snmp_location/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_snmp_location/tests/nxapi/sanity.yaml
deleted file mode 100644
index e30ea6eaf7..0000000000
--- a/test/integration/targets/nxos_snmp_location/tests/nxapi/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ nxapi }}"
-
-- import_tasks: "{{ role_path }}/tests/common/sanity.yaml"
diff --git a/test/integration/targets/nxos_snmp_user/tests/cli/sanity.yaml b/test/integration/targets/nxos_snmp_user/tests/cli/sanity.yaml
deleted file mode 100644
index ddc152e309..0000000000
--- a/test/integration/targets/nxos_snmp_user/tests/cli/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ cli }}"
-
-- import_tasks: targets/nxos_snmp_user/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_snmp_user/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_snmp_user/tests/nxapi/sanity.yaml
deleted file mode 100644
index 1ae7b202c4..0000000000
--- a/test/integration/targets/nxos_snmp_user/tests/nxapi/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ nxapi }}"
-
-- import_tasks: targets/nxos_snmp_user/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_static_route/tests/cli/sanity.yaml b/test/integration/targets/nxos_static_route/tests/cli/sanity.yaml
deleted file mode 100644
index ad856f1460..0000000000
--- a/test/integration/targets/nxos_static_route/tests/cli/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ cli }}"
-
-- import_tasks: targets/nxos_static_route/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_static_route/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_static_route/tests/nxapi/sanity.yaml
deleted file mode 100644
index 5b4e0f8732..0000000000
--- a/test/integration/targets/nxos_static_route/tests/nxapi/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ nxapi }}"
-
-- import_tasks: targets/nxos_static_route/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_udld/tests/cli/sanity.yaml b/test/integration/targets/nxos_udld/tests/cli/sanity.yaml
deleted file mode 100644
index 50c7c43faf..0000000000
--- a/test/integration/targets/nxos_udld/tests/cli/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ cli }}"
-
-- import_tasks: targets/nxos_udld/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_udld/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_udld/tests/nxapi/sanity.yaml
deleted file mode 100644
index 2eecada20d..0000000000
--- a/test/integration/targets/nxos_udld/tests/nxapi/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ nxapi }}"
-
-- import_tasks: targets/nxos_udld/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_udld_interface/tests/cli/sanity.yaml b/test/integration/targets/nxos_udld_interface/tests/cli/sanity.yaml
deleted file mode 100644
index 50cbac8494..0000000000
--- a/test/integration/targets/nxos_udld_interface/tests/cli/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ cli }}"
-
-- import_tasks: targets/nxos_udld_interface/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_udld_interface/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_udld_interface/tests/nxapi/sanity.yaml
deleted file mode 100644
index 5cfe70cc64..0000000000
--- a/test/integration/targets/nxos_udld_interface/tests/nxapi/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ nxapi }}"
-
-- import_tasks: targets/nxos_udld_interface/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_vpc/tests/cli/sanity.yaml b/test/integration/targets/nxos_vpc/tests/cli/sanity.yaml
deleted file mode 100644
index c1cb1acb1a..0000000000
--- a/test/integration/targets/nxos_vpc/tests/cli/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ cli }}"
-
-- import_tasks: targets/nxos_vpc/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_vpc/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_vpc/tests/nxapi/sanity.yaml
deleted file mode 100644
index d04b6a422b..0000000000
--- a/test/integration/targets/nxos_vpc/tests/nxapi/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ nxapi }}"
-
-- import_tasks: targets/nxos_vpc/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_vpc_interface/tests/cli/sanity.yaml b/test/integration/targets/nxos_vpc_interface/tests/cli/sanity.yaml
deleted file mode 100644
index e490d8e597..0000000000
--- a/test/integration/targets/nxos_vpc_interface/tests/cli/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ cli }}"
-
-- import_tasks: targets/nxos_vpc_interface/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_vpc_interface/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_vpc_interface/tests/nxapi/sanity.yaml
deleted file mode 100644
index dea9331d12..0000000000
--- a/test/integration/targets/nxos_vpc_interface/tests/nxapi/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ nxapi }}"
-
-- import_tasks: targets/nxos_vpc_interface/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_vrf_af/tests/cli/sanity.yaml b/test/integration/targets/nxos_vrf_af/tests/cli/sanity.yaml
deleted file mode 100644
index 47b06c4a1d..0000000000
--- a/test/integration/targets/nxos_vrf_af/tests/cli/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ cli }}"
-
-- import_tasks: targets/nxos_vrf_af/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_vrf_af/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_vrf_af/tests/nxapi/sanity.yaml
deleted file mode 100644
index ec7fd8ebc7..0000000000
--- a/test/integration/targets/nxos_vrf_af/tests/nxapi/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ nxapi }}"
-
-- import_tasks: targets/nxos_vrf_af/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_vxlan_vtep_vni/tests/cli/sanity.yaml b/test/integration/targets/nxos_vxlan_vtep_vni/tests/cli/sanity.yaml
deleted file mode 100644
index 3cb3ee6c49..0000000000
--- a/test/integration/targets/nxos_vxlan_vtep_vni/tests/cli/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ cli }}"
-
-- import_tasks: targets/nxos_vxlan_vtep_vni/tests/common/sanity.yaml
diff --git a/test/integration/targets/nxos_vxlan_vtep_vni/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_vxlan_vtep_vni/tests/nxapi/sanity.yaml
deleted file mode 100644
index 1c0c43c5ac..0000000000
--- a/test/integration/targets/nxos_vxlan_vtep_vni/tests/nxapi/sanity.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ nxapi }}"
-
-- import_tasks: targets/nxos_vxlan_vtep_vni/tests/common/sanity.yaml