diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py
index c8de2c3fa1d6..5aee46e5006d 100644
--- a/nova/tests/unit/virt/libvirt/test_driver.py
+++ b/nova/tests/unit/virt/libvirt/test_driver.py
@@ -13421,32 +13421,6 @@ class LibvirtConnTestCase(test.NoDBTestCase):
         self.assertEqual(5, drvr._get_vcpu_used())
         mock_list.assert_called_with(only_guests=True, only_running=True)
 
-    @mock.patch.object(host.Host, "list_instance_domains")
-    def test_failing_vcpu_count_none(self, mock_list):
-        """Domain will return zero if the current number of vcpus used
-        is None. This is in case of VM state starting up or shutting
-        down. None type returned is counted as zero.
-        """
-
-        class DiagFakeDomain(object):
-            def __init__(self):
-                pass
-
-            def vcpus(self):
-                return None
-
-            def ID(self):
-                return 1
-
-            def name(self):
-                return "instance000001"
-
-        mock_list.return_value = [DiagFakeDomain()]
-
-        drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
-        self.assertEqual(0, drvr._get_vcpu_used())
-        mock_list.assert_called_with(only_guests=True, only_running=True)
-
     def test_get_instance_capabilities(self):
         drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
 
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index b1e07d0f985d..d4b87c9edea3 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -5131,8 +5131,7 @@ class LibvirtDriver(driver.ComputeDriver):
         for guest in self._host.list_guests():
             try:
                 vcpus = guest.get_vcpus_info()
-                if vcpus is not None:
-                    total += len(list(vcpus))
+                total += len(list(vcpus))
             except libvirt.libvirtError as e:
                 LOG.warning(
                     _LW("couldn't obtain the vcpu count from domain id:"
diff --git a/nova/virt/libvirt/guest.py b/nova/virt/libvirt/guest.py
index 6c2b9e195444..f5cb9233b5ae 100644
--- a/nova/virt/libvirt/guest.py
+++ b/nova/virt/libvirt/guest.py
@@ -257,10 +257,9 @@ class Guest(object):
         :returns: guest.VCPUInfo
         """
         vcpus = self._domain.vcpus()
-        if vcpus is not None:
-            for vcpu in vcpus[0]:
-                yield VCPUInfo(
-                    id=vcpu[0], cpu=vcpu[3], state=vcpu[1], time=vcpu[2])
+        for vcpu in vcpus[0]:
+            yield VCPUInfo(
+                id=vcpu[0], cpu=vcpu[3], state=vcpu[1], time=vcpu[2])
 
     def delete_configuration(self):
         """Undefines a domain from hypervisor."""