diff --git a/ntc_templates/templates/huawei_vrp_display_service-set_all.textfsm b/ntc_templates/templates/huawei_vrp_display_service-set_all.textfsm
index fcba36d906..bbd5808958 100644
--- a/ntc_templates/templates/huawei_vrp_display_service-set_all.textfsm
+++ b/ntc_templates/templates/huawei_vrp_display_service-set_all.textfsm
@@ -1,6 +1,6 @@
 Value ID (\d+)
 Value NAME (\w+)
-Value SSID (\w+)
+Value SSID (\S+)
 
 Start
   ^\s*-+ -> Next
diff --git a/tests/huawei_vrp/display_service-set_all/huawei_vrp_display_service-set_all.raw b/tests/huawei_vrp/display_service-set_all/huawei_vrp_display_service-set_all.raw
index 2f765a57b1..fde22fab2b 100644
--- a/tests/huawei_vrp/display_service-set_all/huawei_vrp_display_service-set_all.raw
+++ b/tests/huawei_vrp/display_service-set_all/huawei_vrp_display_service-set_all.raw
@@ -3,5 +3,7 @@
   0       Livebox_5ad8                    Livebox_5ad8                     
   1       Livebox_5ad8__5G                Livebox_5ad8                     
   2       Profile_my_guest_wifi           my_guest_wifi                    
+  3       SSID0                           MyHome-2.4GHZ          
+  8       SSID8                           MyHome-5GHZ 
   ----------------------------------------------------------------------------
   Total: 3
diff --git a/tests/huawei_vrp/display_service-set_all/huawei_vrp_display_service-set_all.yml b/tests/huawei_vrp/display_service-set_all/huawei_vrp_display_service-set_all.yml
index ecaf4d149c..5788cc14f2 100644
--- a/tests/huawei_vrp/display_service-set_all/huawei_vrp_display_service-set_all.yml
+++ b/tests/huawei_vrp/display_service-set_all/huawei_vrp_display_service-set_all.yml
@@ -9,3 +9,9 @@ parsed_sample:
   - id: "2"
     name: "Profile_my_guest_wifi"
     ssid: "my_guest_wifi"
+  - id: "3"
+    name: "SSID0"
+    ssid: "MyHome-2.4GHZ"
+  - id: "8"
+    name: "SSID8"
+    ssid: "MyHome-5GHZ"