diff --git a/ansible/roles/test/tasks/arpall.yml b/ansible/roles/test/tasks/arpall.yml
index 5ebd3b0a12b..e45a2d690b9 100644
--- a/ansible/roles/test/tasks/arpall.yml
+++ b/ansible/roles/test/tasks/arpall.yml
@@ -21,7 +21,7 @@
       become: yes
 
     # Send Unicast ARP request from correct interface, expecting reply
-    - name: Send correct arp packets (10.10.1.3 to 10.10.1.2 with src_mac=00:06:07:08:09:00)
+    - name: Send correct unicast arp packets (10.10.1.3 to 10.10.1.2 with src_mac=00:06:07:08:09:00)
       command: ptf  --test-dir acstests arptest.VerifyUnicastARPReply --platform remote -t "acs_mac='{{ ansible_Ethernet4['macaddress'] }}'"
       args:
         chdir: /root
diff --git a/ansible/roles/test/tasks/snmp.yml b/ansible/roles/test/tasks/snmp.yml
index 5bbe7df591a..6864bff7cd6 100644
--- a/ansible/roles/test/tasks/snmp.yml
+++ b/ansible/roles/test/tasks/snmp.yml
@@ -7,4 +7,10 @@
 - name: Validating SNMP was successful and Hostname is what is expected
   assert: { that: "ansible_sysname == '{{ inventory_hostname }}'" }
 
+- block:
+    - name: inlcude snmp cpu test
+      include: roles/test/tasks/snmp/cpu.yml
 
+    - name: include snmp interfaces test
+      include: roles/test/tasks/snmp/interfaces.yml
+  when: testcase_name is defined
diff --git a/ansible/roles/test/vars/testcases.yml b/ansible/roles/test/vars/testcases.yml
index dbe4bff0199..e98bc7278eb 100644
--- a/ansible/roles/test/vars/testcases.yml
+++ b/ansible/roles/test/vars/testcases.yml
@@ -110,14 +110,14 @@ testcases:
           testbed_type:
 
     neighbour:
-      filename: neighbour.yml
+      filename: neighbour-mac.yml
       topologies: [ptf32, ptf64]
       required_vars:
           ptf_host:
 
     neighbour_mac_noptf:
       filename: neighbour-mac-noptf.yml
-      topologies: [ptf32, ptf64]
+      topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64]
 
     ntp:
       filename: ntp.yml