diff --git a/nova/tests/virt/libvirt/test_libvirt.py b/nova/tests/virt/libvirt/test_libvirt.py
index 4c93664d5f72..b909b66c9c05 100644
--- a/nova/tests/virt/libvirt/test_libvirt.py
+++ b/nova/tests/virt/libvirt/test_libvirt.py
@@ -871,17 +871,21 @@ class LibvirtConnTestCase(test.TestCase):
         self.assertEqual(type(cfg.clock),
                          vconfig.LibvirtConfigGuestClock)
         self.assertEqual(cfg.clock.offset, "utc")
-        self.assertEqual(len(cfg.clock.timers), 2)
+        self.assertEqual(len(cfg.clock.timers), 3)
         self.assertEqual(type(cfg.clock.timers[0]),
                          vconfig.LibvirtConfigGuestTimer)
         self.assertEqual(type(cfg.clock.timers[1]),
                          vconfig.LibvirtConfigGuestTimer)
+        self.assertEqual(type(cfg.clock.timers[2]),
+                         vconfig.LibvirtConfigGuestTimer)
         self.assertEqual(cfg.clock.timers[0].name, "pit")
         self.assertEqual(cfg.clock.timers[0].tickpolicy,
                          "delay")
         self.assertEqual(cfg.clock.timers[1].name, "rtc")
         self.assertEqual(cfg.clock.timers[1].tickpolicy,
                          "catchup")
+        self.assertEqual(cfg.clock.timers[2].name, "hpet")
+        self.assertEqual(cfg.clock.timers[2].present, False)
 
     def test_get_guest_config_windows(self):
         conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 786f977b19d2..1045314a4c3d 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -3140,8 +3140,13 @@ class LibvirtDriver(driver.ComputeDriver):
             tmrtc.name = "rtc"
             tmrtc.tickpolicy = "catchup"
 
+            tmhpet = vconfig.LibvirtConfigGuestTimer()
+            tmhpet.name = "hpet"
+            tmhpet.present = False
+
             clk.add_timer(tmpit)
             clk.add_timer(tmrtc)
+            clk.add_timer(tmhpet)
 
         for cfg in self.get_guest_storage_config(instance,
                                                  image_meta,