diff --git a/nova/db/api.py b/nova/db/api.py
index de7b1de74..a8869458c 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -43,9 +43,9 @@ these objects be simple dictionaries.
 
 """
 
-from nova.common import cfg
 from nova import exception
 from nova import flags
+from nova.openstack.common import cfg
 from nova import utils
 
 
diff --git a/nova/db/base.py b/nova/db/base.py
index 77b7d82a7..a1b3bf711 100644
--- a/nova/db/base.py
+++ b/nova/db/base.py
@@ -18,9 +18,9 @@
 
 """Base class for classes that need modular database access."""
 
-from nova.common import cfg
 from nova import utils
 from nova import flags
+from nova.openstack.common import cfg
 
 
 db_driver_opt = \
diff --git a/nova/test.py b/nova/test.py
index f8e9c390f..7fe4b4abb 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -33,10 +33,10 @@ import mox
 import nose.plugins.skip
 import stubout
 
-from nova.common import cfg
 from nova import flags
 import nova.image.fake
 from nova import log
+from nova.openstack.common import cfg
 from nova import utils
 from nova import service
 from nova.testing.fake import rabbit
diff --git a/nova/utils.py b/nova/utils.py
index f86b4ff1f..72e1cd3e0 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -46,10 +46,10 @@ from eventlet import semaphore
 from eventlet.green import subprocess
 import netaddr
 
-from nova.common import cfg
 from nova import exception
 from nova import flags
 from nova import log as logging
+from nova.openstack.common import cfg
 
 
 LOG = logging.getLogger("nova.utils")