diff --git a/nova/virt/libvirt/imagebackend.py b/nova/virt/libvirt/imagebackend.py
index 67c53f1be17d..205aa40c359d 100644
--- a/nova/virt/libvirt/imagebackend.py
+++ b/nova/virt/libvirt/imagebackend.py
@@ -66,7 +66,6 @@ __imagebackend_opts = [
                default='',  # default determined by librados
                help='Path to the ceph configuration file to use'),
     cfg.StrOpt('hw_disk_discard',
-               default=None,
                help='Discard option for nova managed disks (valid options '
                     'are: ignore, unmap). Need Libvirt(1.0.6) Qemu1.5 '
                     '(raw format) Qemu1.6(qcow2 format)'),
diff --git a/nova/volume/cinder.py b/nova/volume/cinder.py
index 782205adff33..2070fa21b142 100644
--- a/nova/volume/cinder.py
+++ b/nova/volume/cinder.py
@@ -61,7 +61,7 @@ cinder_opts = [
                help='Number of cinderclient retries on failed http calls',
             deprecated_group='DEFAULT',
             deprecated_name='cinder_http_retries'),
-    cfg.IntOpt('http_timeout', default=None,
+    cfg.IntOpt('http_timeout',
                help='HTTP inactivity timeout (in seconds)',
                deprecated_group='DEFAULT',
                deprecated_name='cinder_http_timeout'),