diff --git a/templates/cisco_ios_show_lldp_neighbors.template b/templates/cisco_ios_show_lldp_neighbors.template
index 7bfd7a674e..bd5c725195 100644
--- a/templates/cisco_ios_show_lldp_neighbors.template
+++ b/templates/cisco_ios_show_lldp_neighbors.template
@@ -1,4 +1,4 @@
-Value Required NEIGHBOR (\S+)
+Value Required NEIGHBOR (\S{0,20})
 Value Required LOCAL_INTERFACE (\S+)
 Value Required NEIGHBOR_INTERFACE (\S+)
 
@@ -6,6 +6,6 @@ Start
   ^Device.*ID -> LLDP
 
 LLDP
-  ^${NEIGHBOR}\s+${LOCAL_INTERFACE}\s+\d+\s+(\S+)*\s+${NEIGHBOR_INTERFACE} -> Record
+  ^${NEIGHBOR}\s*${LOCAL_INTERFACE}\s+\d+\s+(\S+)*\s+${NEIGHBOR_INTERFACE} -> Record
   ^${NEIGHBOR}
   ^\s+${LOCAL_INTERFACE}\s+\d+\s+(\S+)*\s+${NEIGHBOR_INTERFACE} -> Record
diff --git a/tests/cisco_ios/show_lldp_neighbors/cisco_ios_show_lldp_neighbors2.parsed b/tests/cisco_ios/show_lldp_neighbors/cisco_ios_show_lldp_neighbors2.parsed
new file mode 100644
index 0000000000..c6cf89712d
--- /dev/null
+++ b/tests/cisco_ios/show_lldp_neighbors/cisco_ios_show_lldp_neighbors2.parsed
@@ -0,0 +1,5 @@
+---
+parsed_sample:
+- neighbor: "long_name_swt.josh-v"
+  local_interface: "Gi0/2"
+  neighbor_interface: "Gi0/0"
diff --git a/tests/cisco_ios/show_lldp_neighbors/cisco_ios_show_lldp_neighbors2.raw b/tests/cisco_ios/show_lldp_neighbors/cisco_ios_show_lldp_neighbors2.raw
new file mode 100644
index 0000000000..027c64161d
--- /dev/null
+++ b/tests/cisco_ios/show_lldp_neighbors/cisco_ios_show_lldp_neighbors2.raw
@@ -0,0 +1,8 @@
+Capability codes:
+    (R) Router, (B) Bridge, (T) Telephone, (C) DOCSIS Cable Device
+    (W) WLAN Access Point, (P) Repeater, (S) Station, (O) Other
+
+Device ID           Local Intf     Hold-time  Capability      Port ID
+long_name_swt.josh-vGi0/2          120        R               Gi0/0
+
+Total entries displayed: 1