diff --git a/nova/api/openstack/compute/legacy_v2/contrib/rescue.py b/nova/api/openstack/compute/legacy_v2/contrib/rescue.py
index 1e04d7c8bc8b..1b4e91c0cd90 100644
--- a/nova/api/openstack/compute/legacy_v2/contrib/rescue.py
+++ b/nova/api/openstack/compute/legacy_v2/contrib/rescue.py
@@ -14,7 +14,6 @@
 
 """The rescue mode extension."""
 
-from oslo_config import cfg
 import webob
 from webob import exc
 
@@ -26,7 +25,6 @@ from nova import exception
 from nova import utils
 
 
-CONF = cfg.CONF
 authorize = exts.extension_authorizer('compute', 'rescue')
 
 
diff --git a/nova/image/download/__init__.py b/nova/image/download/__init__.py
index ee0cd341ec20..81c7de485f66 100644
--- a/nova/image/download/__init__.py
+++ b/nova/image/download/__init__.py
@@ -13,14 +13,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
 from oslo_log import log as logging
 import stevedore.driver
 import stevedore.extension
 
 from nova.i18n import _LE
 
-CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
 
diff --git a/nova/network/security_group/neutron_driver.py b/nova/network/security_group/neutron_driver.py
index 27fc13e87e36..409136585e55 100644
--- a/nova/network/security_group/neutron_driver.py
+++ b/nova/network/security_group/neutron_driver.py
@@ -17,7 +17,6 @@ import sys
 
 from neutronclient.common import exceptions as n_exc
 from neutronclient.neutron import v2_0 as neutronv20
-from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import excutils
 from oslo_utils import uuidutils
@@ -33,7 +32,6 @@ from nova import objects
 from nova import utils
 
 
-CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
 # NOTE: Neutron client has a max URL length of 8192, so we have
diff --git a/nova/network/security_group/security_group_base.py b/nova/network/security_group/security_group_base.py
index d076752918cc..e5af41cc5e75 100644
--- a/nova/network/security_group/security_group_base.py
+++ b/nova/network/security_group/security_group_base.py
@@ -19,14 +19,10 @@
 
 import urllib
 
-from oslo_config import cfg
-
 from nova import exception
 from nova.i18n import _
 from nova import utils
 
-CONF = cfg.CONF
-
 
 class SecurityGroupBase(object):
 
diff --git a/nova/scheduler/filters/compute_filter.py b/nova/scheduler/filters/compute_filter.py
index acdccb56adb8..ae124a94d7c8 100644
--- a/nova/scheduler/filters/compute_filter.py
+++ b/nova/scheduler/filters/compute_filter.py
@@ -13,15 +13,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
 from oslo_log import log as logging
 
 from nova.i18n import _LW
 from nova.scheduler import filters
 from nova import servicegroup
 
-CONF = cfg.CONF
-
 LOG = logging.getLogger(__name__)
 
 
diff --git a/nova/tests/functional/db/api/test_migrations.py b/nova/tests/functional/db/api/test_migrations.py
index 67d5e11aa978..c9abbae1611f 100644
--- a/nova/tests/functional/db/api/test_migrations.py
+++ b/nova/tests/functional/db/api/test_migrations.py
@@ -33,7 +33,6 @@ import os
 
 from migrate.versioning import repository
 import mock
-from oslo_config import cfg
 from oslo_db.sqlalchemy import test_base
 from oslo_db.sqlalchemy import test_migrations
 from oslo_db.sqlalchemy import utils as db_utils
@@ -47,9 +46,6 @@ from nova.db.sqlalchemy import migration as sa_migration
 from nova import test
 
 
-CONF = cfg.CONF
-
-
 class NovaAPIModelsSync(test_migrations.ModelsMigrationsSync):
     """Test that the models match the database after migrations are run."""
 
diff --git a/nova/tests/functional/libvirt/test_rt_servers.py b/nova/tests/functional/libvirt/test_rt_servers.py
index 96aaacf16703..98f1e89475ba 100644
--- a/nova/tests/functional/libvirt/test_rt_servers.py
+++ b/nova/tests/functional/libvirt/test_rt_servers.py
@@ -16,7 +16,6 @@
 import mock
 
 import fixtures
-from oslo_config import cfg
 from oslo_log import log as logging
 
 from nova.tests.functional.api import client
@@ -26,7 +25,6 @@ from nova.tests.unit.virt.libvirt import fake_libvirt_utils
 from nova.tests.unit.virt.libvirt import fakelibvirt
 
 
-CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
 
diff --git a/nova/tests/unit/api/openstack/compute/test_attach_interfaces.py b/nova/tests/unit/api/openstack/compute/test_attach_interfaces.py
index ddb7d00147bf..db138cf20d30 100644
--- a/nova/tests/unit/api/openstack/compute/test_attach_interfaces.py
+++ b/nova/tests/unit/api/openstack/compute/test_attach_interfaces.py
@@ -14,7 +14,6 @@
 #    under the License.
 
 import mock
-from oslo_config import cfg
 
 from nova.api.openstack.compute import attach_interfaces \
         as attach_interfaces_v21
@@ -31,8 +30,6 @@ from nova.tests.unit import fake_network_cache_model
 from webob import exc
 
 
-CONF = cfg.CONF
-
 FAKE_UUID1 = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
 FAKE_UUID2 = 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb'
 
diff --git a/nova/tests/unit/api/openstack/compute/test_console_auth_tokens.py b/nova/tests/unit/api/openstack/compute/test_console_auth_tokens.py
index c6333aac2ed0..79f207c232c4 100644
--- a/nova/tests/unit/api/openstack/compute/test_console_auth_tokens.py
+++ b/nova/tests/unit/api/openstack/compute/test_console_auth_tokens.py
@@ -15,7 +15,6 @@
 
 import copy
 
-from oslo_config import cfg
 import webob
 
 from nova.api.openstack.compute import console_auth_tokens \
@@ -26,8 +25,6 @@ from nova.consoleauth import rpcapi as consoleauth_rpcapi
 from nova import test
 from nova.tests.unit.api.openstack import fakes
 
-CONF = cfg.CONF
-
 _FAKE_CONNECT_INFO = {'instance_uuid': 'fake_instance_uuid',
                       'host': 'fake_host',
                       'port': 'fake_port',
diff --git a/nova/tests/unit/api/openstack/compute/test_microversions.py b/nova/tests/unit/api/openstack/compute/test_microversions.py
index 94c994f824df..bea9e2c8d202 100644
--- a/nova/tests/unit/api/openstack/compute/test_microversions.py
+++ b/nova/tests/unit/api/openstack/compute/test_microversions.py
@@ -13,15 +13,12 @@
 #    under the License.
 
 import mock
-from oslo_config import cfg
 from oslo_serialization import jsonutils
 
 from nova.api.openstack import api_version_request as api_version
 from nova import test
 from nova.tests.unit.api.openstack import fakes
 
-CONF = cfg.CONF
-
 
 class MicroversionsTest(test.NoDBTestCase):
 
diff --git a/nova/tests/unit/api/openstack/compute/test_plugin_framework.py b/nova/tests/unit/api/openstack/compute/test_plugin_framework.py
index 0482aa994e4d..0bf6a1952e0c 100644
--- a/nova/tests/unit/api/openstack/compute/test_plugin_framework.py
+++ b/nova/tests/unit/api/openstack/compute/test_plugin_framework.py
@@ -13,14 +13,11 @@
 #    under the License.
 
 import mock
-from oslo_config import cfg
 from oslo_serialization import jsonutils
 
 from nova import test
 from nova.tests.unit.api.openstack import fakes
 
-CONF = cfg.CONF
-
 
 class PluginTest(test.NoDBTestCase):
 
diff --git a/nova/tests/unit/api/openstack/compute/test_security_group_default_rules.py b/nova/tests/unit/api/openstack/compute/test_security_group_default_rules.py
index a227744e6786..3f254892d59b 100644
--- a/nova/tests/unit/api/openstack/compute/test_security_group_default_rules.py
+++ b/nova/tests/unit/api/openstack/compute/test_security_group_default_rules.py
@@ -13,7 +13,6 @@
 #    under the License.
 
 import mock
-from oslo_config import cfg
 import webob
 
 from nova.api.openstack.compute.legacy_v2.contrib import \
@@ -27,9 +26,6 @@ from nova import test
 from nova.tests.unit.api.openstack import fakes
 
 
-CONF = cfg.CONF
-
-
 class AttrDict(dict):
     def __getattr__(self, k):
         return self[k]
diff --git a/nova/tests/unit/console/test_websocketproxy.py b/nova/tests/unit/console/test_websocketproxy.py
index a6b20650e636..1e7e306dcfa4 100644
--- a/nova/tests/unit/console/test_websocketproxy.py
+++ b/nova/tests/unit/console/test_websocketproxy.py
@@ -20,9 +20,6 @@ import mock
 from nova.console import websocketproxy
 from nova import exception
 from nova import test
-from oslo_config import cfg
-
-CONF = cfg.CONF
 
 
 class NovaProxyRequestHandlerBaseTestCase(test.NoDBTestCase):
diff --git a/nova/tests/unit/scheduler/test_scheduler_utils.py b/nova/tests/unit/scheduler/test_scheduler_utils.py
index ba11a23c06f9..e1eb7d3c33bc 100644
--- a/nova/tests/unit/scheduler/test_scheduler_utils.py
+++ b/nova/tests/unit/scheduler/test_scheduler_utils.py
@@ -18,7 +18,6 @@ Tests For Scheduler Utils
 import uuid
 
 import mock
-from oslo_config import cfg
 import six
 
 from nova.compute import flavors
@@ -32,8 +31,6 @@ from nova import test
 from nova.tests.unit import fake_instance
 from nova.tests.unit.objects import test_flavor
 
-CONF = cfg.CONF
-
 
 class SchedulerUtilsTestCase(test.NoDBTestCase):
     """Test case for scheduler utils methods."""
diff --git a/nova/tests/unit/test_notifications.py b/nova/tests/unit/test_notifications.py
index 187a85bf7a4c..83f2d3cbb46a 100644
--- a/nova/tests/unit/test_notifications.py
+++ b/nova/tests/unit/test_notifications.py
@@ -24,7 +24,6 @@ from oslo_context import fixture as o_fixture
 from nova.compute import flavors
 from nova.compute import task_states
 from nova.compute import vm_states
-import nova.conf
 from nova import context
 from nova import exception
 from nova import notifications
@@ -34,8 +33,6 @@ from nova import test
 from nova.tests.unit import fake_network
 from nova.tests.unit import fake_notifier
 
-CONF = nova.conf.CONF
-
 
 class NotificationsTestCase(test.TestCase):
 
diff --git a/nova/tests/unit/virt/disk/vfs/test_localfs.py b/nova/tests/unit/virt/disk/vfs/test_localfs.py
index e767ca0844ac..069424175ae5 100644
--- a/nova/tests/unit/virt/disk/vfs/test_localfs.py
+++ b/nova/tests/unit/virt/disk/vfs/test_localfs.py
@@ -16,7 +16,6 @@ import tempfile
 
 import mock
 from oslo_concurrency import processutils
-from oslo_config import cfg
 
 from nova import exception
 from nova import test
@@ -26,7 +25,6 @@ from nova.virt.disk.mount import nbd
 from nova.virt.disk.vfs import localfs as vfsimpl
 from nova.virt.image import model as imgmodel
 
-CONF = cfg.CONF
 
 dirs = []
 files = {}
diff --git a/nova/tests/unit/virt/vmwareapi/test_read_write_util.py b/nova/tests/unit/virt/vmwareapi/test_read_write_util.py
index 74541c01e2a0..d58402273f6a 100644
--- a/nova/tests/unit/virt/vmwareapi/test_read_write_util.py
+++ b/nova/tests/unit/virt/vmwareapi/test_read_write_util.py
@@ -16,13 +16,10 @@
 import urllib
 
 import mock
-from oslo_config import cfg
 
 from nova import test
 from nova.virt.vmwareapi import read_write_util
 
-CONF = cfg.CONF
-
 
 class ReadWriteUtilTestCase(test.NoDBTestCase):
 
diff --git a/nova/tests/unit/virt/vmwareapi/test_vif.py b/nova/tests/unit/virt/vmwareapi/test_vif.py
index 81fce0db7e37..515f298e2fbf 100644
--- a/nova/tests/unit/virt/vmwareapi/test_vif.py
+++ b/nova/tests/unit/virt/vmwareapi/test_vif.py
@@ -14,7 +14,6 @@
 #    under the License.
 
 import mock
-from oslo_config import cfg
 from oslo_vmware import exceptions as vexc
 from oslo_vmware import vim_util
 
@@ -29,8 +28,6 @@ from nova.virt.vmwareapi import network_util
 from nova.virt.vmwareapi import vif
 from nova.virt.vmwareapi import vm_util
 
-CONF = cfg.CONF
-
 
 class VMwareVifTestCase(test.NoDBTestCase):
     def setUp(self):
diff --git a/nova/virt/hyperv/snapshotops.py b/nova/virt/hyperv/snapshotops.py
index 58b45c639a59..8949a7d6801f 100644
--- a/nova/virt/hyperv/snapshotops.py
+++ b/nova/virt/hyperv/snapshotops.py
@@ -20,7 +20,6 @@ import os
 
 from os_win import exceptions as os_win_exc
 from os_win import utilsfactory
-from oslo_config import cfg
 from oslo_log import log as logging
 
 from nova.compute import task_states
@@ -30,7 +29,6 @@ from nova.image import glance
 from nova import utils
 from nova.virt.hyperv import pathutils
 
-CONF = cfg.CONF
 LOG = logging.getLogger(__name__)