diff --git a/glance_store/_drivers/cinder.py b/glance_store/_drivers/cinder.py
index a2b4a155..856f1000 100644
--- a/glance_store/_drivers/cinder.py
+++ b/glance_store/_drivers/cinder.py
@@ -17,7 +17,7 @@ import logging
 from cinderclient import exceptions as cinder_exception
 from cinderclient import service_catalog
 from cinderclient.v2 import client as cinderclient
-from oslo.config import cfg
+from oslo_config import cfg
 
 from glance_store.common import utils
 import glance_store.driver
diff --git a/glance_store/_drivers/filesystem.py b/glance_store/_drivers/filesystem.py
index f45b05e5..42f59ffb 100644
--- a/glance_store/_drivers/filesystem.py
+++ b/glance_store/_drivers/filesystem.py
@@ -25,8 +25,8 @@ import os
 import stat
 import urlparse
 
-from oslo.config import cfg
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 from oslo_utils import excutils
 from oslo_utils import units
 
diff --git a/glance_store/_drivers/gridfs.py b/glance_store/_drivers/gridfs.py
index c7003f7f..7fdb6b1e 100644
--- a/glance_store/_drivers/gridfs.py
+++ b/glance_store/_drivers/gridfs.py
@@ -19,7 +19,7 @@ from __future__ import absolute_import
 import logging
 import urlparse
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import excutils
 
 import glance_store.driver
diff --git a/glance_store/_drivers/rbd.py b/glance_store/_drivers/rbd.py
index 7daa4e0c..6a453206 100644
--- a/glance_store/_drivers/rbd.py
+++ b/glance_store/_drivers/rbd.py
@@ -23,7 +23,7 @@ import logging
 import math
 import urllib
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from glance_store.common import utils
 from glance_store import driver
diff --git a/glance_store/_drivers/s3.py b/glance_store/_drivers/s3.py
index ef3ced13..0e3589e6 100644
--- a/glance_store/_drivers/s3.py
+++ b/glance_store/_drivers/s3.py
@@ -25,7 +25,7 @@ import urlparse
 
 import boto.exception
 import eventlet
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import netutils
 from oslo_utils import units
 import six
diff --git a/glance_store/_drivers/sheepdog.py b/glance_store/_drivers/sheepdog.py
index a8cb8516..b62483f7 100644
--- a/glance_store/_drivers/sheepdog.py
+++ b/glance_store/_drivers/sheepdog.py
@@ -19,7 +19,7 @@ import hashlib
 import logging
 
 from oslo.concurrency import processutils
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import excutils
 from oslo_utils import units
 
diff --git a/glance_store/_drivers/vmware_datastore.py b/glance_store/_drivers/vmware_datastore.py
index 3b89d4b6..a4ab6fe5 100644
--- a/glance_store/_drivers/vmware_datastore.py
+++ b/glance_store/_drivers/vmware_datastore.py
@@ -21,8 +21,8 @@ import logging
 import os
 import socket
 
-from oslo.config import cfg
 from oslo.vmware import api
+from oslo_config import cfg
 from oslo_utils import excutils
 from oslo_utils import units
 import six.moves.urllib.parse as urlparse
diff --git a/glance_store/common/config.py b/glance_store/common/config.py
index 7ec38248..cda9ac0c 100644
--- a/glance_store/common/config.py
+++ b/glance_store/common/config.py
@@ -22,7 +22,7 @@ import logging.config
 import logging.handlers
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 from paste import deploy
 
 from glance.version import version_info as version
diff --git a/glance_store/tests/base.py b/glance_store/tests/base.py
index 867efe92..0f07e355 100644
--- a/glance_store/tests/base.py
+++ b/glance_store/tests/base.py
@@ -18,7 +18,7 @@ import os
 import shutil
 
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 from oslotest import base
 
 import glance_store as store
diff --git a/requirements.txt b/requirements.txt
index fd0c0823..0a7c9e27 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-oslo.config>=1.2.0
+oslo.config>=1.6.0 # Apache-2.0
 oslo.i18n>=0.1.0
 oslo.serialization>=1.0.0 # Apache-2.0
 oslo.utils>=1.2.0 # Apache-2.0
diff --git a/tests/unit/test_swift_store.py b/tests/unit/test_swift_store.py
index b36ef19f..992236d3 100644
--- a/tests/unit/test_swift_store.py
+++ b/tests/unit/test_swift_store.py
@@ -24,7 +24,7 @@ import tempfile
 import uuid
 
 import httpretty
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import units
 from oslotest import moxstubout
 import six