diff --git a/nova/tests/unit/virt/xenapi/test_driver.py b/nova/tests/unit/virt/xenapi/test_driver.py
index 432e75473870..c32d9ea8179f 100644
--- a/nova/tests/unit/virt/xenapi/test_driver.py
+++ b/nova/tests/unit/virt/xenapi/test_driver.py
@@ -82,7 +82,7 @@ class XenAPIDriverTestCase(stubs.XenAPITestBaseNoDB):
         self.assertEqual(10, resources['vcpus_used'])
         self.assertEqual(3 - 2, resources['memory_mb_used'])
         self.assertEqual(2, resources['local_gb_used'])
-        self.assertEqual('xen', resources['hypervisor_type'])
+        self.assertEqual('XenServer', resources['hypervisor_type'])
         self.assertEqual('somename', resources['hypervisor_hostname'])
         self.assertEqual(1, resources['disk_available_least'])
 
diff --git a/nova/virt/xenapi/driver.py b/nova/virt/xenapi/driver.py
index 785dc46e6a76..bc9c157458cf 100644
--- a/nova/virt/xenapi/driver.py
+++ b/nova/virt/xenapi/driver.py
@@ -453,7 +453,7 @@ class XenAPIDriver(driver.ComputeDriver):
                'vcpus_used': host_stats['vcpus_used'],
                'memory_mb_used': total_ram_mb - free_ram_mb,
                'local_gb_used': used_disk_gb,
-               'hypervisor_type': 'xen',
+               'hypervisor_type': 'XenServer',
                'hypervisor_version': hyper_ver,
                'hypervisor_hostname': host_stats['host_hostname'],
                'cpu_info': jsonutils.dumps(host_stats['cpu_model']),