diff --git a/requirements-py3.txt b/requirements-py3.txt
index c7005468..5c54fa88 100644
--- a/requirements-py3.txt
+++ b/requirements-py3.txt
@@ -5,7 +5,7 @@ alembic>=0.4.1
 Babel>=1.3
 iso8601>=0.1.9
 oauthlib>=0.6
-oslo.config>=1.9.3
+oslo.config>=1.11.0
 oslo.context>=0.2.0
 oslo.utils>=1.4.0
 pecan>=0.4.5
diff --git a/requirements.txt b/requirements.txt
index af9e8b34..450c4f6c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ alembic>=0.4.1
 Babel>=1.3
 iso8601>=0.1.9
 oauthlib>=0.6
-oslo.config>=1.9.3
+oslo.config>=1.11.0
 oslo.context>=0.2.0
 oslo.utils>=1.4.0
 pecan>=0.4.5
diff --git a/storyboard/api/app.py b/storyboard/api/app.py
index 35a30399..f816a4f1 100644
--- a/storyboard/api/app.py
+++ b/storyboard/api/app.py
@@ -15,7 +15,7 @@
 
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import _options
 from oslo_log import log
 import pecan
diff --git a/storyboard/api/app.wsgi b/storyboard/api/app.wsgi
index f6e03317..a52fc34f 100644
--- a/storyboard/api/app.wsgi
+++ b/storyboard/api/app.wsgi
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 from storyboard.api import app
-from oslo.config import cfg
+from oslo_config import cfg
 
 CONF = cfg.CONF
 
diff --git a/storyboard/api/auth/__init__.py b/storyboard/api/auth/__init__.py
index 72454900..18359af1 100644
--- a/storyboard/api/auth/__init__.py
+++ b/storyboard/api/auth/__init__.py
@@ -12,7 +12,7 @@
 # implied. See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from storyboard.openstack.common.gettextutils import _  # noqa
 
diff --git a/storyboard/api/auth/oauth_validator.py b/storyboard/api/auth/oauth_validator.py
index 59701844..9cf43da5 100644
--- a/storyboard/api/auth/oauth_validator.py
+++ b/storyboard/api/auth/oauth_validator.py
@@ -18,7 +18,7 @@ import pytz
 
 from oauthlib.oauth2 import RequestValidator
 from oauthlib.oauth2 import WebApplicationServer
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 from storyboard.db.api import access_tokens as token_api
diff --git a/storyboard/api/auth/openid_client.py b/storyboard/api/auth/openid_client.py
index ee7cd40b..f5917364 100644
--- a/storyboard/api/auth/openid_client.py
+++ b/storyboard/api/auth/openid_client.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 import requests
 import six
diff --git a/storyboard/api/config.py b/storyboard/api/config.py
index 039ec7a1..b2914f83 100644
--- a/storyboard/api/config.py
+++ b/storyboard/api/config.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 app = {
     'root': 'storyboard.api.root_controller.RootController',
diff --git a/storyboard/api/v1/branches.py b/storyboard/api/v1/branches.py
index 0184ca15..7c1b99f7 100644
--- a/storyboard/api/v1/branches.py
+++ b/storyboard/api/v1/branches.py
@@ -16,7 +16,7 @@
 from datetime import datetime
 import pytz
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import abort
 from pecan import response
 from pecan import rest
diff --git a/storyboard/api/v1/milestones.py b/storyboard/api/v1/milestones.py
index dfc5e3a3..d50db6b7 100644
--- a/storyboard/api/v1/milestones.py
+++ b/storyboard/api/v1/milestones.py
@@ -16,7 +16,7 @@
 from datetime import datetime
 import pytz
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import abort
 from pecan import response
 from pecan import rest
diff --git a/storyboard/api/v1/project_groups.py b/storyboard/api/v1/project_groups.py
index 4939a95f..541ffca5 100644
--- a/storyboard/api/v1/project_groups.py
+++ b/storyboard/api/v1/project_groups.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import abort
 from pecan import response
 from pecan import rest
diff --git a/storyboard/api/v1/projects.py b/storyboard/api/v1/projects.py
index 0ebad8d2..1bae292c 100644
--- a/storyboard/api/v1/projects.py
+++ b/storyboard/api/v1/projects.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan.decorators import expose
 from pecan import response
 from pecan import rest
diff --git a/storyboard/api/v1/search/search_engine.py b/storyboard/api/v1/search/search_engine.py
index 114241d8..cb7f5285 100644
--- a/storyboard/api/v1/search/search_engine.py
+++ b/storyboard/api/v1/search/search_engine.py
@@ -15,7 +15,7 @@
 
 import abc
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from storyboard.db import models
 
diff --git a/storyboard/api/v1/stories.py b/storyboard/api/v1/stories.py
index 2ebc8123..667a9461 100644
--- a/storyboard/api/v1/stories.py
+++ b/storyboard/api/v1/stories.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import abort
 from pecan import expose
 from pecan import request
diff --git a/storyboard/api/v1/subscription_events.py b/storyboard/api/v1/subscription_events.py
index e7b5cbdc..fee03786 100644
--- a/storyboard/api/v1/subscription_events.py
+++ b/storyboard/api/v1/subscription_events.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import abort
 from pecan import request
 from pecan import response
diff --git a/storyboard/api/v1/subscriptions.py b/storyboard/api/v1/subscriptions.py
index c06f9d53..49a9004d 100644
--- a/storyboard/api/v1/subscriptions.py
+++ b/storyboard/api/v1/subscriptions.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import abort
 from pecan import request
 from pecan import response
diff --git a/storyboard/api/v1/system_info.py b/storyboard/api/v1/system_info.py
index d69c1293..adea07cf 100644
--- a/storyboard/api/v1/system_info.py
+++ b/storyboard/api/v1/system_info.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pbr.version import VersionInfo
 from pecan import rest
 from pecan.secure import secure
diff --git a/storyboard/api/v1/tags.py b/storyboard/api/v1/tags.py
index 2f40eacc..8f868416 100644
--- a/storyboard/api/v1/tags.py
+++ b/storyboard/api/v1/tags.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import request
 from pecan import rest
 from pecan.secure import secure
diff --git a/storyboard/api/v1/task_statuses.py b/storyboard/api/v1/task_statuses.py
index 3f0d9644..95e8cf24 100644
--- a/storyboard/api/v1/task_statuses.py
+++ b/storyboard/api/v1/task_statuses.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import response
 from pecan import rest
 from pecan.secure import secure
diff --git a/storyboard/api/v1/tasks.py b/storyboard/api/v1/tasks.py
index 28b0cc8f..1f324122 100644
--- a/storyboard/api/v1/tasks.py
+++ b/storyboard/api/v1/tasks.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import abort
 from pecan import request
 from pecan import response
diff --git a/storyboard/api/v1/teams.py b/storyboard/api/v1/teams.py
index 7ff6347f..8e01dd53 100644
--- a/storyboard/api/v1/teams.py
+++ b/storyboard/api/v1/teams.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import abort
 from pecan.decorators import expose
 from pecan import response
diff --git a/storyboard/api/v1/timeline.py b/storyboard/api/v1/timeline.py
index 0d2afb15..1b6eeab6 100644
--- a/storyboard/api/v1/timeline.py
+++ b/storyboard/api/v1/timeline.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import abort
 from pecan import request
 from pecan import response
diff --git a/storyboard/api/v1/user_preferences.py b/storyboard/api/v1/user_preferences.py
index 46b87823..4a77d6d0 100644
--- a/storyboard/api/v1/user_preferences.py
+++ b/storyboard/api/v1/user_preferences.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 from pecan import abort
 from pecan import request
diff --git a/storyboard/api/v1/user_tokens.py b/storyboard/api/v1/user_tokens.py
index e7a29bd0..6b5a8ccb 100644
--- a/storyboard/api/v1/user_tokens.py
+++ b/storyboard/api/v1/user_tokens.py
@@ -15,7 +15,7 @@
 
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 from pecan import abort
 from pecan import request
diff --git a/storyboard/api/v1/users.py b/storyboard/api/v1/users.py
index 41bc75f6..f882d4fe 100644
--- a/storyboard/api/v1/users.py
+++ b/storyboard/api/v1/users.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import abort
 from pecan import expose
 from pecan import request
diff --git a/storyboard/common/working_dir.py b/storyboard/common/working_dir.py
index 7ec171ba..d12995e2 100644
--- a/storyboard/common/working_dir.py
+++ b/storyboard/common/working_dir.py
@@ -17,7 +17,7 @@ import os
 
 import six
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 
diff --git a/storyboard/db/api/base.py b/storyboard/db/api/base.py
index 990976fb..1a3fc84a 100644
--- a/storyboard/db/api/base.py
+++ b/storyboard/db/api/base.py
@@ -15,7 +15,7 @@
 
 import copy
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_db import exception as db_exc
 from oslo_db.sqlalchemy import session as db_session
 from oslo_db.sqlalchemy.utils import InvalidSortKey
diff --git a/storyboard/db/api/timeline_events.py b/storyboard/db/api/timeline_events.py
index a73e475f..cfd5adb2 100644
--- a/storyboard/db/api/timeline_events.py
+++ b/storyboard/db/api/timeline_events.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import json
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import request
 from pecan import response
 from wsme.rest.json import tojson
diff --git a/storyboard/db/migration/cli.py b/storyboard/db/migration/cli.py
index 2d67e7ac..ec5dc227 100644
--- a/storyboard/db/migration/cli.py
+++ b/storyboard/db/migration/cli.py
@@ -21,7 +21,7 @@ import os
 from alembic import command as alembic_command
 from alembic import config as alembic_config
 from alembic import util as alembic_util
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_db import options
 import six
 
diff --git a/storyboard/db/models.py b/storyboard/db/models.py
index 2546aa11..1977e744 100644
--- a/storyboard/db/models.py
+++ b/storyboard/db/models.py
@@ -22,7 +22,7 @@ import pytz
 import six
 import six.moves.urllib.parse as urlparse
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_db.sqlalchemy import models
 from sqlalchemy import Boolean
 from sqlalchemy import Column
diff --git a/storyboard/db/projects_loader.py b/storyboard/db/projects_loader.py
index 7ca18a17..4010bbc0 100644
--- a/storyboard/db/projects_loader.py
+++ b/storyboard/db/projects_loader.py
@@ -16,7 +16,7 @@
 import warnings
 import yaml
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 import six
 from sqlalchemy.exc import SADeprecationWarning
diff --git a/storyboard/migrate/cli.py b/storyboard/migrate/cli.py
index b633cb65..f311bed5 100644
--- a/storyboard/migrate/cli.py
+++ b/storyboard/migrate/cli.py
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 from storyboard.db.api import base as db_api
diff --git a/storyboard/notifications/conf.py b/storyboard/notifications/conf.py
index 839fada2..393f357e 100644
--- a/storyboard/notifications/conf.py
+++ b/storyboard/notifications/conf.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 CONF = cfg.CONF
 
diff --git a/storyboard/notifications/connection_service.py b/storyboard/notifications/connection_service.py
index eab45798..136b63bc 100644
--- a/storyboard/notifications/connection_service.py
+++ b/storyboard/notifications/connection_service.py
@@ -17,7 +17,7 @@ from threading import Timer
 
 import pika
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 from storyboard.openstack.common.gettextutils import _, _LI  # noqa
diff --git a/storyboard/notifications/publisher.py b/storyboard/notifications/publisher.py
index c11b47cc..80580e1d 100644
--- a/storyboard/notifications/publisher.py
+++ b/storyboard/notifications/publisher.py
@@ -15,7 +15,7 @@
 
 import json
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 from pika.exceptions import ConnectionClosed
 
diff --git a/storyboard/notifications/subscriber.py b/storyboard/notifications/subscriber.py
index 582df17e..29b7c87e 100644
--- a/storyboard/notifications/subscriber.py
+++ b/storyboard/notifications/subscriber.py
@@ -16,7 +16,7 @@
 import json
 import time
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 from pika.exceptions import ConnectionClosed
 from stevedore import enabled
diff --git a/storyboard/openstack/common/fixture/config.py b/storyboard/openstack/common/fixture/config.py
index 9489b85a..fc9f783c 100644
--- a/storyboard/openstack/common/fixture/config.py
+++ b/storyboard/openstack/common/fixture/config.py
@@ -16,7 +16,7 @@
 #    under the License.
 
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 
diff --git a/storyboard/openstack/common/lockutils.py b/storyboard/openstack/common/lockutils.py
index ca84a5b6..2624ec79 100644
--- a/storyboard/openstack/common/lockutils.py
+++ b/storyboard/openstack/common/lockutils.py
@@ -26,7 +26,7 @@ import threading
 import time
 import weakref
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from storyboard.openstack.common import fileutils
diff --git a/storyboard/plugin/base.py b/storyboard/plugin/base.py
index c26f50d1..bc0cc9ad 100644
--- a/storyboard/plugin/base.py
+++ b/storyboard/plugin/base.py
@@ -15,7 +15,7 @@
 import abc
 import six
 
-from oslo.config import cfg
+from oslo_config import cfg
 from stevedore.enabled import EnabledExtensionManager
 
 
diff --git a/storyboard/plugin/email/__init__.py b/storyboard/plugin/email/__init__.py
index daa6dafa..1d3b54b6 100644
--- a/storyboard/plugin/email/__init__.py
+++ b/storyboard/plugin/email/__init__.py
@@ -12,7 +12,7 @@
 # implied. See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 from storyboard.common.working_dir import get_plugin_directory
diff --git a/storyboard/plugin/email/base.py b/storyboard/plugin/email/base.py
index 83757b3c..b00259ad 100644
--- a/storyboard/plugin/email/base.py
+++ b/storyboard/plugin/email/base.py
@@ -15,7 +15,7 @@
 
 import smtplib
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 from storyboard.plugin.base import PluginBase
diff --git a/storyboard/plugin/email/outbox.py b/storyboard/plugin/email/outbox.py
index ef16f2fc..1feff511 100644
--- a/storyboard/plugin/email/outbox.py
+++ b/storyboard/plugin/email/outbox.py
@@ -18,7 +18,7 @@ import six
 import time
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 from storyboard.plugin.email import get_email_directory
diff --git a/storyboard/plugin/email/smtp_client.py b/storyboard/plugin/email/smtp_client.py
index 89fd9f2b..a75c0484 100644
--- a/storyboard/plugin/email/smtp_client.py
+++ b/storyboard/plugin/email/smtp_client.py
@@ -14,7 +14,7 @@
 
 import smtplib
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 CONF = cfg.CONF
diff --git a/storyboard/plugin/event_worker.py b/storyboard/plugin/event_worker.py
index e211dc6c..b86fac2d 100644
--- a/storyboard/plugin/event_worker.py
+++ b/storyboard/plugin/event_worker.py
@@ -17,7 +17,7 @@ from multiprocessing import Process
 import signal
 from threading import Timer
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 import storyboard.db.api.base as db_api
diff --git a/storyboard/plugin/scheduler/__init__.py b/storyboard/plugin/scheduler/__init__.py
index 3e862fcb..240a2872 100644
--- a/storyboard/plugin/scheduler/__init__.py
+++ b/storyboard/plugin/scheduler/__init__.py
@@ -15,7 +15,7 @@
 import atexit
 import six
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 from pytz import utc
 
diff --git a/storyboard/plugin/token_cleaner/__init__.py b/storyboard/plugin/token_cleaner/__init__.py
index d806005e..2dc2c54f 100644
--- a/storyboard/plugin/token_cleaner/__init__.py
+++ b/storyboard/plugin/token_cleaner/__init__.py
@@ -12,7 +12,7 @@
 # implied. See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 CONF = cfg.CONF
 
diff --git a/storyboard/tests/api/auth/test_oauth.py b/storyboard/tests/api/auth/test_oauth.py
index 932d14f4..581048f2 100644
--- a/storyboard/tests/api/auth/test_oauth.py
+++ b/storyboard/tests/api/auth/test_oauth.py
@@ -19,7 +19,7 @@ import requests
 import uuid
 
 from mock import patch
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 import six.moves.urllib.parse as urlparse
 
diff --git a/storyboard/tests/api/middleware/test_redirect_middleware.py b/storyboard/tests/api/middleware/test_redirect_middleware.py
index 6c418329..4b720f4e 100644
--- a/storyboard/tests/api/middleware/test_redirect_middleware.py
+++ b/storyboard/tests/api/middleware/test_redirect_middleware.py
@@ -14,7 +14,7 @@
 
 import six
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from storyboard.tests import base
 
diff --git a/storyboard/tests/base.py b/storyboard/tests/base.py
index 9b637050..36e130d8 100644
--- a/storyboard/tests/base.py
+++ b/storyboard/tests/base.py
@@ -22,7 +22,7 @@ import uuid
 
 from alembic import command
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import pecan
 import pecan.testing
diff --git a/storyboard/tests/common/test_exception.py b/storyboard/tests/common/test_exception.py
index f393ff46..d486c4b6 100644
--- a/storyboard/tests/common/test_exception.py
+++ b/storyboard/tests/common/test_exception.py
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from six.moves import http_client
 
 import storyboard.common.exception as exc
diff --git a/storyboard/tests/common/test_hook_priority.py b/storyboard/tests/common/test_hook_priority.py
index f8a85897..124c1565 100644
--- a/storyboard/tests/common/test_hook_priority.py
+++ b/storyboard/tests/common/test_hook_priority.py
@@ -12,7 +12,7 @@
 # implied. See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 import storyboard.common.hook_priorities as priority
 import storyboard.tests.base as base
diff --git a/storyboard/tests/common/test_working_dir.py b/storyboard/tests/common/test_working_dir.py
index bd3c566d..00ba03b0 100644
--- a/storyboard/tests/common/test_working_dir.py
+++ b/storyboard/tests/common/test_working_dir.py
@@ -16,7 +16,7 @@ import os
 import shutil
 import stat
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 import storyboard.common.working_dir as working_dir
 import storyboard.tests.base as base
diff --git a/storyboard/tests/db/migration/test_migrations.py b/storyboard/tests/db/migration/test_migrations.py
index e65ac0af..94c92341 100644
--- a/storyboard/tests/db/migration/test_migrations.py
+++ b/storyboard/tests/db/migration/test_migrations.py
@@ -37,7 +37,7 @@ postgres=# create database openstack_citest with owner openstack_citest;
 
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_db.sqlalchemy import utils as db_utils
 
 from storyboard.tests.db.migration import test_migrations_base as base
diff --git a/storyboard/tests/db/migration/test_migrations_base.py b/storyboard/tests/db/migration/test_migrations_base.py
index b0578293..c38b7f5b 100644
--- a/storyboard/tests/db/migration/test_migrations_base.py
+++ b/storyboard/tests/db/migration/test_migrations_base.py
@@ -28,7 +28,7 @@ import os
 from alembic import command
 from alembic import config as alembic_config
 from alembic import migration
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import six
 from six.moves import configparser
@@ -308,7 +308,7 @@ class BaseWalkMigrationTestCase(BaseMigrationTestCase):
         """For each type of repository we should do some of configure steps.
         For migrate_repo we should set under version control our database.
         For alembic we should configure database settings. For this goal we
-        should use oslo.config and openstack.commom.db.sqlalchemy.session with
+        should use oslo_config and openstack.commom.db.sqlalchemy.session with
         database functionality (reset default settings and session cleanup).
         """
         CONF.set_override('connection', six.text_type(engine.url),
diff --git a/storyboard/tests/plugin/email/test_base.py b/storyboard/tests/plugin/email/test_base.py
index f95b350d..4888a881 100644
--- a/storyboard/tests/plugin/email/test_base.py
+++ b/storyboard/tests/plugin/email/test_base.py
@@ -17,7 +17,7 @@ import shutil
 import smtplib
 import stat
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 import mock_smtp as mock
 from storyboard.plugin.email.base import EmailPluginBase
diff --git a/storyboard/tests/plugin/email/test_init.py b/storyboard/tests/plugin/email/test_init.py
index d56dcb3c..47dccd73 100644
--- a/storyboard/tests/plugin/email/test_init.py
+++ b/storyboard/tests/plugin/email/test_init.py
@@ -15,7 +15,7 @@
 import os
 import stat
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from storyboard.plugin.email import get_email_directory
 from storyboard.tests import base
diff --git a/storyboard/tests/plugin/email/test_outbox.py b/storyboard/tests/plugin/email/test_outbox.py
index 1c33158b..ba5aa236 100644
--- a/storyboard/tests/plugin/email/test_outbox.py
+++ b/storyboard/tests/plugin/email/test_outbox.py
@@ -20,7 +20,7 @@ import re
 import six
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from storyboard.plugin.email.factory import EmailFactory
 from storyboard.plugin.email.outbox import get_outbox
diff --git a/storyboard/tests/plugin/email/test_smtp_client.py b/storyboard/tests/plugin/email/test_smtp_client.py
index 9b249c55..8beac631 100644
--- a/storyboard/tests/plugin/email/test_smtp_client.py
+++ b/storyboard/tests/plugin/email/test_smtp_client.py
@@ -12,7 +12,7 @@
 # implied. See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 import mock_smtp as mock
 from storyboard.plugin.email.smtp_client import get_smtp_client
diff --git a/storyboard/tests/plugin/email/test_workers.py b/storyboard/tests/plugin/email/test_workers.py
index 2d56525c..0ed4931c 100644
--- a/storyboard/tests/plugin/email/test_workers.py
+++ b/storyboard/tests/plugin/email/test_workers.py
@@ -17,7 +17,7 @@ from mock import patch
 from random import random
 import smtplib
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from storyboard.plugin.email.factory import EmailFactory
 from storyboard.plugin.email.outbox import Outbox
diff --git a/storyboard/tests/plugin/scheduler/mock_plugin.py b/storyboard/tests/plugin/scheduler/mock_plugin.py
index 8ef4ed8d..6521934f 100644
--- a/storyboard/tests/plugin/scheduler/mock_plugin.py
+++ b/storyboard/tests/plugin/scheduler/mock_plugin.py
@@ -15,7 +15,7 @@
 import datetime
 
 from apscheduler.triggers.date import DateTrigger
-from oslo.config import cfg
+from oslo_config import cfg
 
 import storyboard.plugin.scheduler.base as plugin_base
 
diff --git a/storyboard/tests/plugin/scheduler/test_init.py b/storyboard/tests/plugin/scheduler/test_init.py
index 9f8f0575..651b6de0 100644
--- a/storyboard/tests/plugin/scheduler/test_init.py
+++ b/storyboard/tests/plugin/scheduler/test_init.py
@@ -17,7 +17,7 @@ import datetime
 from apscheduler.triggers.date import DateTrigger
 
 from apscheduler.triggers.interval import IntervalTrigger
-from oslo.config import cfg
+from oslo_config import cfg
 from stevedore.extension import Extension
 
 from plugin.scheduler.mock_plugin import MockPlugin
diff --git a/storyboard/tests/plugin/token_cleaner/test_cleaner.py b/storyboard/tests/plugin/token_cleaner/test_cleaner.py
index a4357fda..a0aa18aa 100644
--- a/storyboard/tests/plugin/token_cleaner/test_cleaner.py
+++ b/storyboard/tests/plugin/token_cleaner/test_cleaner.py
@@ -16,7 +16,7 @@ from datetime import datetime
 from datetime import timedelta
 import pytz
 
-from oslo.config import cfg
+from oslo_config import cfg
 import storyboard.db.api.base as db_api
 from storyboard.db.models import AccessToken
 from storyboard.db.models import RefreshToken