diff --git a/test/integration/targets/aci_switch_leaf_selector/aliases b/test/integration/targets/aci_switch_leaf_selector/aliases
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/integration/targets/aci_switch_leaf_selector/tasks/main.yml b/test/integration/targets/aci_switch_leaf_selector/tasks/main.yml
new file mode 100644
index 00000000000..4d4f38fbbaf
--- /dev/null
+++ b/test/integration/targets/aci_switch_leaf_selector/tasks/main.yml
@@ -0,0 +1,142 @@
+# Test code for the ACI modules
+# Copyright 2017, Bruno Calogero <bcalogero@cisco.com>
+
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+- name: hello there
+  set_fact:
+    aci_hostname: svlngen4-fab4-apic1.cisco.com
+    aci_username: admin
+    aci_password: F@b44p1c
+
+- name: Test that we have an ACI APIC host, ACI username and ACI password
+  fail:
+    msg: 'Please define the following variables: aci_hostname, aci_username and aci_password.'
+  when: aci_hostname is not defined or aci_username is not defined or aci_password is not defined
+
+- name: Deleting Switch Policy Leaf profile exists for kick off
+  aci_switch_policy_leaf_profile:
+    host: "{{ aci_hostname }}"
+    username: "{{ aci_username }}"
+    password: "{{ aci_password }}"
+    leaf_profile: sw_name_test
+    validate_certs: no
+    use_ssl: no
+    use_proxy: no
+    state: absent
+
+- name: Ensuring Switch Policy Leaf profile exists for kick off
+  aci_switch_policy_leaf_profile: &aci_switch_policy_leaf_profile_present
+    host: "{{ aci_hostname }}"
+    username: "{{ aci_username }}"
+    password: "{{ aci_password }}"
+    leaf_profile: sw_name_test
+    validate_certs: no
+    use_ssl: no
+    use_proxy: no
+    state: present
+  register: leaf_profile_present
+
+# TODO: Ensure that leaf Policy Group Exists (module missing) (infra:AccPortGrp)
+
+- name: Adding a switch policy leaf profile selector associated Node Block range (w/o policy group) - check mode works
+  aci_switch_leaf_selector: &aci_switch_leaf_selector_present
+    <<: *aci_switch_policy_leaf_profile_present
+    leaf: leaf_selector_name
+    leaf_node_blk: node_blk_name
+    from: 1011
+    to: 1011
+  check_mode: yes
+  register: sw_leaf_selec_check_mode_present
+
+- name: Adding a switch policy leaf profile selector associated Node Block range (w/o policy group) - creation works
+  aci_switch_leaf_selector:
+    <<: *aci_switch_leaf_selector_present
+  register: sw_leaf_selec_present
+
+- name: Adding a switch policy leaf profile selector associated Node Block range (w/o policy group) - idempotency works
+  aci_switch_leaf_selector:
+    <<: *aci_switch_leaf_selector_present
+  register: sw_leaf_selec_idempotent
+
+- name: Adding a switch policy leaf profile selector associated Node Block range (w/ policy group) - update works
+  aci_switch_leaf_selector:
+    <<: *aci_switch_leaf_selector_present
+    policy_group: anstest_policygroupname
+  register: sw_leaf_selec_update
+
+# TODO: also test for errors
+- name: present assertions
+  assert:
+    that:
+    - sw_leaf_selec_check_mode_present.changed == true
+    - sw_leaf_selec_present.changed == true
+    - sw_leaf_selec_present.existing == []
+    - 'sw_leaf_selec_present.config ==  {"infraLeafS": {"attributes": {"name": "leaf_selector_name"}, "children": [{"infraNodeBlk": {"attributes": {"from_": "1011", "name": "node_blk_name", "to_": "1011"}}},{"infraRsAccNodePGrp": {"attributes": {"tDn": "uni/infra/funcprof/accnodepgrp-None"}}}]}}'
+    - sw_leaf_selec_idempotent.changed == false
+    - sw_leaf_selec_idempotent.config == {}
+    - sw_leaf_selec_update.changed == true
+    - 'sw_leaf_selec_update.config == {"infraLeafS": {"attributes": {},"children": [{"infraRsAccNodePGrp": {"attributes": {"tDn": "uni/infra/funcprof/accnodepgrp-anstest_policygroupname"}}}]}}'
+
+- name: Query Specific switch policy leaf profile selector
+  aci_switch_leaf_selector:
+    <<: *aci_switch_policy_leaf_profile_present
+    leaf: leaf_selector_name # "{{ fake_var | default(omit) }}" ?
+    state: query
+  register: binding_query
+
+- name: present assertions
+  assert:
+    that:
+      - binding_query.changed == false
+      - binding_query.existing | length >= 1
+      - '"api/mo/uni/infra/nprof-sw_name_test/leaves-leaf_selector_name-typ-range.json" in binding_query.url'
+
+- name: Remove binding of interface access port selector and Interface Policy Leaf Profile - check mode
+  aci_switch_leaf_selector: &aci_switch_leaf_selector_absent
+    <<: *aci_switch_policy_leaf_profile_present
+    leaf: leaf_selector_name
+    state: absent
+  check_mode: yes
+  register: sw_leaf_selec_check_mode_absent
+
+- name: Remove switch policy leaf profile selector - delete works
+  aci_switch_leaf_selector:
+    <<: *aci_switch_leaf_selector_absent
+  register: sw_leaf_selec_absent
+
+- name: Remove switch policy leaf profile selector - idempotency works
+  aci_switch_leaf_selector:
+    <<: *aci_switch_leaf_selector_absent
+  register: sw_leaf_selec_absent_idempotent
+
+- name: Remove switch policy leaf profile selector - check mode
+  aci_switch_leaf_selector:
+    <<: *aci_switch_policy_leaf_profile_present
+    #access_port_selector: anstest_accessportselector
+    state: absent
+  ignore_errors: yes
+  register: sw_leaf_selec_absent_missing_param
+
+- name: absent assertions
+  assert:
+    that:
+      - sw_leaf_selec_check_mode_absent.changed == true
+      - sw_leaf_selec_check_mode_absent.existing != []
+      - sw_leaf_selec_absent.changed == true
+      - sw_leaf_selec_absent.existing == sw_leaf_selec_check_mode_absent.existing
+      - sw_leaf_selec_absent_idempotent.changed == false
+      - sw_leaf_selec_absent_idempotent.existing == []
+      - sw_leaf_selec_absent_missing_param.failed == true
+      - 'sw_leaf_selec_absent_missing_param.msg == "state is absent but all of the following are missing: leaf"'
+
+
+- name: Remove switch policy leaf profile selector - Clean up
+  aci_switch_leaf_selector:
+    <<: *aci_switch_leaf_selector_absent
+    state: absent
+
+- name: Deleting Switch Policy Leaf profile exists for kick off
+  aci_switch_policy_leaf_profile:
+    <<: *aci_switch_policy_leaf_profile_present
+    state: absent