diff --git a/ntc_templates/templates/huawei_vrp_display_mac-address.textfsm b/ntc_templates/templates/huawei_vrp_display_mac-address.textfsm
index 7f0cded4d0..798d73a9ff 100644
--- a/ntc_templates/templates/huawei_vrp_display_mac-address.textfsm
+++ b/ntc_templates/templates/huawei_vrp_display_mac-address.textfsm
@@ -4,9 +4,9 @@ Value TYPE (\S+)
 Value VLAN_ID (\d+)
 
 Start
-  ^-+$$
+  ^\s*-+$$
   ^\s+$$
-  ^MAC\s+Address
-  ^${DESTINATION_ADDRESS}\s+${VLAN_ID}/([^/]+)/([^/]+)\s+${DESTINATION_PORT}\s+${TYPE} -> Record
-  ^Total\s+items
+  ^\s*MAC\s+Address\s*VLAN\/VSI(?:\/BD)?\s*Learned-From\s*Type\s*$$
+  ^\s*${DESTINATION_ADDRESS}\s+${VLAN_ID}/([^/]+)(?:/([^/]+))?\s+${DESTINATION_PORT}\s+${TYPE}\s*$$ -> Record
+  ^\s*Total\s+items\s*displayed\s*=\s*\d+\s*$$
   ^. -> Error
diff --git a/tests/huawei_vrp/display_mac-address/huawei_vrp_display_mac-address.raw b/tests/huawei_vrp/display_mac-address/huawei_vrp_display_mac-address.raw
index 40fcc17893..cfe992d4bf 100644
--- a/tests/huawei_vrp/display_mac-address/huawei_vrp_display_mac-address.raw
+++ b/tests/huawei_vrp/display_mac-address/huawei_vrp_display_mac-address.raw
@@ -2,7 +2,7 @@
 MAC Address    VLAN/VSI/BD                       Learned-From        Type
 -------------------------------------------------------------------------------
 b8d6-f6ff-7390 10/-/-                            XGE0/0/1            dynamic
-b8d6-f6ff-739b 10/-/-                            XGE0/0/1            dynamic
+ b8d6-f6ff-739b 10/-/-                            XGE0/0/1            dynamic
 
 -------------------------------------------------------------------------------
 Total items displayed = 2
diff --git a/tests/huawei_vrp/display_mac-address/huawei_vrp_display_mac-address2.raw b/tests/huawei_vrp/display_mac-address/huawei_vrp_display_mac-address2.raw
new file mode 100644
index 0000000000..a914d28565
--- /dev/null
+++ b/tests/huawei_vrp/display_mac-address/huawei_vrp_display_mac-address2.raw
@@ -0,0 +1,7 @@
+-------------------------------------------------------------------------------
+MAC Address    VLAN/VSI                          Learned-From        Type      
+-------------------------------------------------------------------------------
+aaaa-aaaa-aaaa 1/-                               GE0/0/25            dynamic   
+bbbb-bbbb-bbbb 1/-                               GE0/0/25            dynamic 
+-------------------------------------------------------------------------------
+Total items displayed = 2
diff --git a/tests/huawei_vrp/display_mac-address/huawei_vrp_display_mac-address2.yml b/tests/huawei_vrp/display_mac-address/huawei_vrp_display_mac-address2.yml
new file mode 100644
index 0000000000..1e8bcb6fe3
--- /dev/null
+++ b/tests/huawei_vrp/display_mac-address/huawei_vrp_display_mac-address2.yml
@@ -0,0 +1,10 @@
+---
+parsed_sample:
+  - destination_address: "aaaa-aaaa-aaaa"
+    destination_port: "GE0/0/25"
+    type: "dynamic"
+    vlan_id: "1"
+  - destination_address: "bbbb-bbbb-bbbb"
+    destination_port: "GE0/0/25"
+    type: "dynamic"
+    vlan_id: "1"