diff --git a/keystone/assignment/routers.py b/keystone/assignment/routers.py
index f6d58c082e..88f45855a6 100644
--- a/keystone/assignment/routers.py
+++ b/keystone/assignment/routers.py
@@ -21,11 +21,8 @@ from keystone.assignment import controllers
 from keystone.common import json_home
 from keystone.common import router
 from keystone.common import wsgi
-import keystone.conf
 
 
-CONF = keystone.conf.CONF
-
 build_os_inherit_relation = functools.partial(
     json_home.build_v3_extension_resource_relation,
     extension_name='OS-INHERIT', extension_version='1.0')
diff --git a/keystone/common/sql/upgrades.py b/keystone/common/sql/upgrades.py
index f5b73af4b2..86d1c0a33f 100644
--- a/keystone/common/sql/upgrades.py
+++ b/keystone/common/sql/upgrades.py
@@ -24,13 +24,10 @@ import six
 import sqlalchemy
 
 from keystone.common import sql
-import keystone.conf
 from keystone import exception
 from keystone.i18n import _
 
 
-CONF = keystone.conf.CONF
-
 USE_TRIGGERS = True
 
 LEGACY_REPO = 'migrate_repo'
diff --git a/keystone/middleware/core.py b/keystone/middleware/core.py
index 3a8e23d48c..d259a9845b 100644
--- a/keystone/middleware/core.py
+++ b/keystone/middleware/core.py
@@ -17,11 +17,9 @@ from oslo_log import versionutils
 from oslo_serialization import jsonutils
 
 from keystone.common import wsgi
-import keystone.conf
 from keystone import exception
 
 
-CONF = keystone.conf.CONF
 LOG = log.getLogger(__name__)
 
 # Header used to transmit the auth token
diff --git a/keystone/models/token_model.py b/keystone/models/token_model.py
index a609039f3e..c869a6308c 100644
--- a/keystone/models/token_model.py
+++ b/keystone/models/token_model.py
@@ -16,12 +16,10 @@ from oslo_utils import reflection
 from oslo_utils import timeutils
 import six
 
-import keystone.conf
 from keystone import exception
 from keystone.federation import constants
 from keystone.i18n import _
 
-CONF = keystone.conf.CONF
 # supported token versions
 V2 = 'v2.0'
 V3 = 'v3.0'
diff --git a/keystone/policy/backends/rules.py b/keystone/policy/backends/rules.py
index abf452caf4..ce22f77e1e 100644
--- a/keystone/policy/backends/rules.py
+++ b/keystone/policy/backends/rules.py
@@ -18,12 +18,10 @@
 from oslo_log import log
 
 from keystone.common import policy
-import keystone.conf
 from keystone import exception
 from keystone.policy.backends import base
 
 
-CONF = keystone.conf.CONF
 LOG = log.getLogger(__name__)
 
 
diff --git a/keystone/resource/config_backends/base.py b/keystone/resource/config_backends/base.py
index 7734bb2a6f..4cbcbff9cb 100644
--- a/keystone/resource/config_backends/base.py
+++ b/keystone/resource/config_backends/base.py
@@ -16,13 +16,9 @@ import abc
 
 import six
 
-import keystone.conf
 from keystone import exception
 
 
-CONF = keystone.conf.CONF
-
-
 @six.add_metaclass(abc.ABCMeta)
 class DomainConfigDriverBase(object):
     """Interface description for a Domain Config driver."""
diff --git a/keystone/tests/unit/credential/test_backend_sql.py b/keystone/tests/unit/credential/test_backend_sql.py
index f7727d2ecf..e4bef244ab 100644
--- a/keystone/tests/unit/credential/test_backend_sql.py
+++ b/keystone/tests/unit/credential/test_backend_sql.py
@@ -14,7 +14,6 @@ import uuid
 
 from six.moves import range
 
-import keystone.conf
 from keystone.credential.providers import fernet as credential_provider
 from keystone.tests import unit
 from keystone.tests.unit import default_fixtures
@@ -22,9 +21,6 @@ from keystone.tests.unit import ksfixtures
 from keystone.tests.unit.ksfixtures import database
 
 
-CONF = keystone.conf.CONF
-
-
 class SqlTests(unit.SQLDriverOverrides, unit.TestCase):
 
     def setUp(self):
diff --git a/keystone/tests/unit/credential/test_fernet_provider.py b/keystone/tests/unit/credential/test_fernet_provider.py
index f7a01f0c1a..b97d59af17 100644
--- a/keystone/tests/unit/credential/test_fernet_provider.py
+++ b/keystone/tests/unit/credential/test_fernet_provider.py
@@ -17,14 +17,11 @@ import uuid
 from oslo_log import log
 
 from keystone.common import fernet_utils
-import keystone.conf
 from keystone.credential.providers import fernet as credential_fernet
 from keystone.tests import unit
 from keystone.tests.unit import ksfixtures
 from keystone.tests.unit.ksfixtures import database
 
-CONF = keystone.conf.CONF
-
 
 class TestFernetCredentialProvider(unit.TestCase):
     def setUp(self):
diff --git a/keystone/tests/unit/ksfixtures/key_repository.py b/keystone/tests/unit/ksfixtures/key_repository.py
index e5fdd33247..45be418475 100644
--- a/keystone/tests/unit/ksfixtures/key_repository.py
+++ b/keystone/tests/unit/ksfixtures/key_repository.py
@@ -13,9 +13,6 @@
 import fixtures
 
 from keystone.common import fernet_utils as utils
-import keystone.conf
-
-CONF = keystone.conf.CONF
 
 
 class KeyRepository(fixtures.Fixture):
diff --git a/keystone/tests/unit/test_sql_upgrade.py b/keystone/tests/unit/test_sql_upgrade.py
index cc392ccedf..61d0364958 100644
--- a/keystone/tests/unit/test_sql_upgrade.py
+++ b/keystone/tests/unit/test_sql_upgrade.py
@@ -57,7 +57,6 @@ from testtools import matchers
 from keystone.cmd import cli
 from keystone.common import sql
 from keystone.common.sql import upgrades
-import keystone.conf
 from keystone.credential.providers import fernet as credential_fernet
 from keystone.resource.backends import base as resource_base
 from keystone.tests import unit
@@ -66,8 +65,6 @@ from keystone.tests.unit import ksfixtures
 from keystone.tests.unit.ksfixtures import database
 
 
-CONF = keystone.conf.CONF
-
 # NOTE(morganfainberg): This should be updated when each DB migration collapse
 # is done to mirror the expected structure of the DB in the format of
 # { <DB_TABLE_NAME>: [<COLUMN>, <COLUMN>, ...], ... }
diff --git a/keystone/tests/unit/test_v3_credential.py b/keystone/tests/unit/test_v3_credential.py
index 76d92a94b7..bdd9ef392b 100644
--- a/keystone/tests/unit/test_v3_credential.py
+++ b/keystone/tests/unit/test_v3_credential.py
@@ -21,7 +21,6 @@ from six.moves import http_client
 from testtools import matchers
 
 from keystone.common import utils
-import keystone.conf
 from keystone.contrib.ec2 import controllers
 from keystone.credential.providers import fernet as credential_fernet
 from keystone import exception
@@ -30,7 +29,6 @@ from keystone.tests.unit import ksfixtures
 from keystone.tests.unit import test_v3
 
 
-CONF = keystone.conf.CONF
 CRED_TYPE_EC2 = controllers.CRED_TYPE_EC2
 
 
diff --git a/keystone/tests/unit/test_versions.py b/keystone/tests/unit/test_versions.py
index 5456af1135..753b9895a4 100644
--- a/keystone/tests/unit/test_versions.py
+++ b/keystone/tests/unit/test_versions.py
@@ -24,14 +24,11 @@ from testtools import matchers as tt_matchers
 import webob
 
 from keystone.common import json_home
-import keystone.conf
 from keystone.tests import unit
 from keystone.tests.unit import utils
 from keystone.version import controllers
 
 
-CONF = keystone.conf.CONF
-
 v2_MEDIA_TYPES = [
     {
         "base": "application/json",