diff --git a/templates/hp_procurve_show_vlans.template b/templates/hp_procurve_show_vlans.template
index a5f5d961f6..0000531e57 100644
--- a/templates/hp_procurve_show_vlans.template
+++ b/templates/hp_procurve_show_vlans.template
@@ -1,5 +1,5 @@
 Value VLAN_ID (\d+)
-Value NAME (\S+)
+Value NAME ([\S+\s+].*(?=\|))
 Value STATUS (\S+)
 Value VOICE (Yes|No)
 Value JUMBO (Yes|No)
@@ -8,4 +8,4 @@ Start
   ^.*VLAN ID -> VLAN
 
 VLAN
-  ^\s+${VLAN_ID}\s+${NAME}\s+${STATUS}\s+${VOICE}\s+${JUMBO} -> Record
+  ^\s+${VLAN_ID}\s+${NAME}\s+\|?\s?${STATUS}\s+${VOICE}\s+${JUMBO}? -> Record
diff --git a/tests/hp_procurve/show_vlans/hp_procurve_show_vlans2.parsed b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans2.parsed
new file mode 100644
index 0000000000..878c3e5548
--- /dev/null
+++ b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans2.parsed
@@ -0,0 +1,21 @@
+---
+
+parsed_sample:
+
+- name: "DEFAULT_VLAN"
+  vlan_id: "1"
+  status: "Port-based"
+  voice: "No"
+  jumbo: "No"
+
+- name: "Router Vlan"
+  vlan_id: "10"
+  status: "Port-based"
+  voice: "No"
+  jumbo: "No"
+
+- name: "Voice"
+  vlan_id: "50"
+  status: "Port-based"
+  voice: "Yes"
+  jumbo: "No"
diff --git a/tests/hp_procurve/show_vlans/hp_procurve_show_vlans2.raw b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans2.raw
new file mode 100644
index 0000000000..e5d733a0bd
--- /dev/null
+++ b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans2.raw
@@ -0,0 +1,11 @@
+ Status and Counters - VLAN Information
+
+  Maximum VLANs to support : 256                  
+  Primary VLAN : DEFAULT_VLAN
+  Management VLAN :             
+
+  VLAN ID Name                             | Status     Voice Jumbo
+  ------- -------------------------------- + ---------- ----- -----
+  1       DEFAULT_VLAN                     | Port-based No    No   
+  10      Router Vlan                      | Port-based No    No   
+  50      Voice                            | Port-based Yes   No   
diff --git a/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.parsed b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.parsed
new file mode 100644
index 0000000000..6f96a61425
--- /dev/null
+++ b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.parsed
@@ -0,0 +1,15 @@
+---
+
+parsed_sample:
+
+- name: "DEFAULT_VLAN"
+  jumbo: ""
+  vlan_id: "1"
+  status: "Port-based"
+  voice: "No"
+
+- name: "VoiceVlan"
+  jumbo: ""
+  vlan_id: "100"
+  status: "Port-based"
+  voice: "Yes"
diff --git a/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.raw b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.raw
new file mode 100644
index 0000000000..0af68e54a4
--- /dev/null
+++ b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.raw
@@ -0,0 +1,10 @@
+ Status and Counters - VLAN Information
+
+  Maximum VLANs to support : 8                    
+  Primary VLAN : DEFAULT_VLAN
+  Management VLAN :             
+
+  802.1Q VLAN ID Name         Status       Voice
+  -------------- ------------ ------------ -----
+  1              DEFAULT_VLAN Port-based   No   
+  100            VoiceVlan    Port-based   Yes