diff --git a/ntc_templates/templates/alcatel_aos_show_mac-address-table.textfsm b/ntc_templates/templates/alcatel_aos_show_mac-address-table.textfsm
index b3381ca05e..1dbe1ac735 100644
--- a/ntc_templates/templates/alcatel_aos_show_mac-address-table.textfsm
+++ b/ntc_templates/templates/alcatel_aos_show_mac-address-table.textfsm
@@ -11,9 +11,10 @@ Start
   ^\s+Vlan\s+Mac\s+Address\s+Type\s+Protocol\s+Operation\s+Interface\s+$$
   ^\s*-+\+
   ^\s*${ADDRESS_NOT_VALID}${VLAN_ID}\s+${MAC}\s+${TYPE}\s+(---|${PROTOCOL})\s+${OPERATION}\s+${INTERFACE}\s*$$ -> Record
-  ^\s*Domain\s+Vlan\/SrvcId\[ISId\/vnId\]\s+Mac\s+Address\s+Type\s+Operation\s+Interface\s*$$
+  ^\s*Domain\s+Vlan\/SrvcId\[(ISId\/vnId|:ID)\]\s+Mac\s+Address\s+Type\s+Operation\s+Interface\s*$$
   ^\s*${DOMAIN}\s+${VLAN_ID}\s+${MAC}\s+${TYPE}\s+${OPERATION}\s+${INTERFACE}\s*$$ -> Record
   ^\s*Total\s+number\s+of\s+Valid\s+MAC\s+addresses\s+above\s+=\s+\d+\s*$$ -> Record
   ^\s*(Legend:\s+)?Mac\s+Address:
+  ^\s*ID\s+=\s+ISID\/Vnid\/vplsid\s*$$
   ^\s*$$
   ^.*$$ -> Error
diff --git a/tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table.raw b/tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_R6.raw
similarity index 100%
rename from tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table.raw
rename to tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_R6.raw
diff --git a/tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table.yml b/tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_R6.yml
similarity index 100%
rename from tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table.yml
rename to tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_R6.yml
diff --git a/tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_2.raw b/tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_R8.raw
similarity index 99%
rename from tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_2.raw
rename to tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_R8.raw
index 11c7f9cc2a..8e49da2bf4 100644
--- a/tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_2.raw
+++ b/tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_R8.raw
@@ -10,4 +10,3 @@ Legend: Mac Address: * = address not valid,
       VLAN                        1   dd:dd:dd:dd:dd:dd            dynamic     bridging                     1/1/1 
 
  Total number of Valid MAC addresses above = 4
-
diff --git a/tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_2.yml b/tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_R8.yml
similarity index 100%
rename from tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_2.yml
rename to tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_R8.yml
diff --git a/tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_R8_9.raw b/tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_R8_9.raw
new file mode 100644
index 0000000000..c0758fad72
--- /dev/null
+++ b/tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_R8_9.raw
@@ -0,0 +1,12 @@
+Legend: Mac Address: * = address not valid,
+        Mac Address: & = duplicate static address,
+        ID = ISID/Vnid/vplsid
+
+    Domain    Vlan/SrvcId[:ID]           Mac Address           Type          Operation          Interface
+------------+----------------------+-------------------+------------------+-------------+-------------------------
+      VLAN                        1   aa:aa:aa:aa:aa:aa            dynamic     bridging                     1/1/1 
+      VLAN                        1   bb:bb:bb:bb:bb:bb            dynamic     bridging                     1/1/1 
+      VLAN                        1   cc:cc:cc:cc:cc:cc            dynamic     bridging                    1/1/10 
+      VLAN                        1   dd:dd:dd:dd:dd:dd            dynamic     bridging                     1/1/1 
+
+ Total number of Valid MAC addresses above = 4
diff --git a/tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_R8_9.yml b/tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_R8_9.yml
new file mode 100644
index 0000000000..b64b523b41
--- /dev/null
+++ b/tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_R8_9.yml
@@ -0,0 +1,34 @@
+---
+parsed_sample:
+  - address_not_valid: ""
+    domain: "VLAN"
+    interface: "1/1/1"
+    mac: "aa:aa:aa:aa:aa:aa"
+    operation: "bridging"
+    protocol: ""
+    type: "dynamic"
+    vlan_id: "1"
+  - address_not_valid: ""
+    domain: "VLAN"
+    interface: "1/1/1"
+    mac: "bb:bb:bb:bb:bb:bb"
+    operation: "bridging"
+    protocol: ""
+    type: "dynamic"
+    vlan_id: "1"
+  - address_not_valid: ""
+    domain: "VLAN"
+    interface: "1/1/10"
+    mac: "cc:cc:cc:cc:cc:cc"
+    operation: "bridging"
+    protocol: ""
+    type: "dynamic"
+    vlan_id: "1"
+  - address_not_valid: ""
+    domain: "VLAN"
+    interface: "1/1/1"
+    mac: "dd:dd:dd:dd:dd:dd"
+    operation: "bridging"
+    protocol: ""
+    type: "dynamic"
+    vlan_id: "1"