diff --git a/test/integration/nxos.yaml b/test/integration/nxos.yaml
deleted file mode 100644
index 49c8cb0a2ae..00000000000
--- a/test/integration/nxos.yaml
+++ /dev/null
@@ -1,600 +0,0 @@
----
-- hosts: nxos
-  gather_facts: no
-  connection: local
-
-  vars:
-    limit_to: "*"
-    debug: false
-
-# Run the tests within blocks allows the next module to be tested if the previous one fails.
-# This is done to allow https://github.com/ansible/dci-partner-ansible/ to run the full set of tests.
-
-
-  tasks:
-    - set_fact:
-        test_failed: false
-        failed_modules: []
-    - block:
-      - include_role:
-          name: nxos_command
-        when: "limit_to in ['*', 'nxos_command']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_command' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_config
-        when: "limit_to in ['*', 'nxos_config']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_config' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_facts
-        when: "limit_to in ['*', 'nxos_facts']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_facts' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_nxapi
-        when: "limit_to in ['*', 'nxos_nxapi']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_nxapi' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_evpn_vni
-        when: "limit_to in ['*', 'nxos_evpn_vni']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_evpn_vni' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_evpn_global
-        when: "limit_to in ['*', 'nxos_evpn_global']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_evpn_global' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_feature
-        when: "limit_to in ['*', 'nxos_feature']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_feature' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_udld
-        when: "limit_to in ['*', 'nxos_udld']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_udld' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_udld_interface
-        when: "limit_to in ['*', 'nxos_udld_interface']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_udld_interface' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_vxlan_vtep_vni
-        when: "limit_to in ['*', 'nxos_vxlan_vtep_vni']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_vxlan_vtep_vni' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_system
-        when: "limit_to in ['*', 'nxos_system']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_system' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_interface
-        when: "limit_to in ['*', 'nxos_interface']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_interface' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_user
-        when: "limit_to in ['*', 'nxos_user']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_user' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_banner
-        when: "limit_to in ['*', 'nxos_banner']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_banner' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_acl
-        when: "limit_to in ['*', 'nxos_acl']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_acl' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_acl_interface
-        when: "limit_to in ['*', 'nxos_acl_interface']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_acl_interface' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_vrf
-        when: "limit_to in ['*', 'nxos_vrf']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_vrf' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_vrf_interface
-        when: "limit_to in ['*', 'nxos_vrf_interface']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_vrf_interface' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_vrrp
-        when: "limit_to in ['*', 'nxos_vrrp']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_vrrp' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_vpc
-        when: "limit_to in ['*', 'nxos_vpc']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_vpc' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_vpc_interface
-        when: "limit_to in ['*', 'nxos_vpc_interface']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_vpc_interface' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_vrf_af
-        when: "limit_to in ['*', 'nxos_vrf_af']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_vrf_af' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_vtp_domain
-        when: "limit_to in ['*', 'nxos_vtp_domain']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_vtp_domain' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_vtp_password
-        when: "limit_to in ['*', 'nxos_vtp_password']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_vtp_password' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_vtp_version
-        when: "limit_to in ['*', 'nxos_vtp_version']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_vtp_version' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_snmp_user
-        when: "limit_to in ['*', 'nxos_snmp_user']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_snmp_user' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_snapshot
-        when: "limit_to in ['*', 'nxos_snapshot']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_snapshot' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_hsrp
-        when: "limit_to in ['*', 'nxos_hsrp']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_hsrp' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_static_route
-        when: "limit_to in ['*', 'nxos_static_route']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_static_route' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_rollback
-        when: "limit_to in ['*', 'nxos_rollback']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_rollback' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_portchannel
-        when: "limit_to in ['*', 'nxos_portchannel']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_portchannel' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_vlan
-        when: "limit_to in ['*', 'nxos_vlan']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_vlan' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_switchport
-        when: "limit_to in ['*', 'nxos_switchport']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_switchport' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_vxlan_vtep
-        when: "limit_to in ['*', 'nxos_vxlan_vtep']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_vxlan_vtep' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_ntp
-        when: "limit_to in ['*', 'nxos_ntp']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_ntp' ]"
-            test_failed: true
-    - block:
-      - include_role:
-          name: nxos_ospf
-        when: "limit_to in ['*', 'nxos_ospf']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_ospf' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_ospf_vrf
-        when: "limit_to in ['*', 'nxos_ospf_vrf']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_ospf_vrf' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_interface_ospf
-        when: "limit_to in ['*', 'nxos_interface_ospf']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_interface_ospf' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_ip_interface
-        when: "limit_to in ['*', 'nxos_ip_interface']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_ip_interface' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_aaa_server
-        when: "limit_to in ['*', 'nxos_aaa_server']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_aaa_server' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_aaa_server_host
-        when: "limit_to in ['*', 'nxos_aaa_server_host']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_aaa_server_host' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_gir
-        when: "limit_to in ['*', 'nxos_gir']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_gir' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_gir_profile_management
-        when: "limit_to in ['*', 'nxos_gir_profile_management']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_gir_profile_management' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_file_copy
-        when: "limit_to in ['*', 'nxos_file_copy']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_file_copy' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_igmp_interface
-        when: "limit_to in ['*', 'nxos_igmp_interface']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_igmp_interface' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_igmp
-        when: "limit_to in ['*', 'nxos_igmp']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_igmp' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_igmp_snooping
-        when: "limit_to in ['*', 'nxos_igmp_snooping']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_igmp_snooping' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_ntp_auth
-        when: "limit_to in ['*', 'nxos_ntp_auth']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_ntp_auth' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_ntp_options
-        when: "limit_to in ['*', 'nxos_ntp_options']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_ntp_options' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_logging
-        when: "limit_to in ['*', 'nxos_logging']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_logging' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_bgp
-        when: "limit_to in ['*', 'nxos_bgp']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_bgp' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_bgp_af
-        when: "limit_to in ['*', 'nxos_bgp_af']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_bgp_af' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_bgp_neighbor
-        when: "limit_to in ['*', 'nxos_bgp_neighbor']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_bgp_neighbor' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_bgp_neighbor_af
-        when: "limit_to in ['*', 'nxos_bgp_neighbor_af']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_bgp_neighbor_af' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_overlay_global
-        when: "limit_to in ['*', 'nxos_overlay_global']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_overlay_global' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_pim
-        when: "limit_to in ['*', 'nxos_pim']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_pim' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_pim_interface
-        when: "limit_to in ['*', 'nxos_pim_interface']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_pim_interface' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_snmp_community
-        when: "limit_to in ['*', 'nxos_snmp_community']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_snmp_community' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_snmp_location
-        when: "limit_to in ['*', 'nxos_snmp_location']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_snmp_location' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_snmp_host
-        when: "limit_to in ['*', 'nxos_snmp_host']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_snmp_host' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_l3_interface
-        when: "limit_to in ['*', 'nxos_l3_interface']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_l3_interface' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_linkagg
-        when: "limit_to in ['*', 'nxos_linkagg']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_linkagg' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_lldp
-        when: "limit_to in ['*', 'nxos_lldp']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_lldp' ]"
-            test_failed: true
-
-    - block:
-      - include_role:
-          name: nxos_l2_interface
-        when: "limit_to in ['*', 'nxos_l2_interface']"
-      rescue:
-        - set_fact:
-            failed_modules: "{{ failed_modules }} + [ 'nxos_l2_interface' ]"
-            test_failed: true
-
-###########
-    - debug: var=failed_modules
-      when: test_failed
-
-    - name: Has any previous test failed?
-      fail:
-        msg: "One or more tests failed, check log for details"
-      when: test_failed