diff --git a/cinder/backup/__init__.py b/cinder/backup/__init__.py
index 1d59acc022c..354580f362e 100644
--- a/cinder/backup/__init__.py
+++ b/cinder/backup/__init__.py
@@ -17,11 +17,10 @@
 # collisions with use of 'from cinder.backup import <foo>' elsewhere.
 
 
-from oslo.config import cfg
-
+from cinder.common import config
 import cinder.openstack.common.importutils
 
 
-CONF = cfg.CONF
+CONF = config.CONF
 
 API = cinder.openstack.common.importutils.import_class(CONF.backup_api_class)
diff --git a/cinder/volume/__init__.py b/cinder/volume/__init__.py
index eaeba432a69..40cb71bbbd8 100644
--- a/cinder/volume/__init__.py
+++ b/cinder/volume/__init__.py
@@ -20,11 +20,10 @@
 # collisions with use of 'from cinder.volume import <foo>' elsewhere.
 
 
-from oslo.config import cfg
-
+from cinder.common import config
 import cinder.openstack.common.importutils as import_utils
 
 
-CONF = cfg.CONF
+CONF = config.CONF
 
 API = import_utils.import_class(CONF.volume_api_class)