diff --git a/templates/cisco_xr_show_version.template b/templates/cisco_xr_show_version.template
index def3ddd9af..f0af95b44c 100644
--- a/templates/cisco_xr_show_version.template
+++ b/templates/cisco_xr_show_version.template
@@ -18,7 +18,7 @@ Start
 Build_Info
   ^\s+Built\sBy.+
   ^\s+Built\sOn.+
-  ^\s+Build\sHost\s+:\s+${BUILD_HOST}
+  ^\s+Buil[dt]\sHost\s+:\s+${BUILD_HOST}
   ^\s+Workspace\s+:\s\S+
   ^\s+Version\s+:\s${VERSION}
   ^\s+Location\s+:\s${LOCATION}
diff --git a/tests/cisco_xr/show_version/cisco_xr_show_version2.parsed b/tests/cisco_xr/show_version/cisco_xr_show_version2.parsed
new file mode 100644
index 0000000000..2cdb14da42
--- /dev/null
+++ b/tests/cisco_xr/show_version/cisco_xr_show_version2.parsed
@@ -0,0 +1,11 @@
+---
+
+parsed_sample:
+
+
+- hardware : 'IOS-XRv'
+  uptime : '1 minute'
+  version : '6.5.1'
+  location : '/opt/cisco/XR/packages/'
+  build_host : 'iox-ucs-019'
+
diff --git a/tests/cisco_xr/show_version/cisco_xr_show_version2.raw b/tests/cisco_xr/show_version/cisco_xr_show_version2.raw
new file mode 100644
index 0000000000..66b5dbc0e5
--- /dev/null
+++ b/tests/cisco_xr/show_version/cisco_xr_show_version2.raw
@@ -0,0 +1,14 @@
+Tue Sep 10 11:01:51.930 UTC
+Cisco IOS XR Software, Version 6.5.1
+Copyright (c) 2013-2018 by Cisco Systems, Inc.
+
+Build Information:
+ Built By     : ahoang
+ Built On     : Wed Aug  8 17:29:38 PDT 2018
+ Built Host   : iox-ucs-019
+ Workspace    : /auto/srcarchive17/prod/6.5.1/xrv9k/ws
+ Version      : 6.5.1
+ Location     : /opt/cisco/XR/packages/
+
+cisco IOS-XRv 9000 () processor
+System uptime is 1 minute