diff --git a/ironic/drivers/modules/ilo/vendor.py b/ironic/drivers/modules/ilo/vendor.py
index 981afa5999..c4e66c6d84 100644
--- a/ironic/drivers/modules/ilo/vendor.py
+++ b/ironic/drivers/modules/ilo/vendor.py
@@ -15,7 +15,6 @@
 Vendor Interface for iLO drivers and its supporting methods.
 """
 
-from oslo_config import cfg
 from oslo_log import log as logging
 
 from ironic.common import exception
@@ -31,8 +30,6 @@ from ironic.drivers.modules import iscsi_deploy
 
 LOG = logging.getLogger(__name__)
 
-CONF = cfg.CONF
-
 
 class IloVirtualMediaAgentVendorInterface(agent.AgentVendorInterface):
     """Interface for vendor passthru related actions."""
diff --git a/ironic/drivers/modules/irmc/power.py b/ironic/drivers/modules/irmc/power.py
index 369c5aa9a8..cdf2eafc33 100644
--- a/ironic/drivers/modules/irmc/power.py
+++ b/ironic/drivers/modules/irmc/power.py
@@ -15,7 +15,6 @@
 """
 iRMC Power Driver using the Base Server Profile
 """
-from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import importutils
 
@@ -32,8 +31,6 @@ from ironic.drivers.modules.irmc import common as irmc_common
 
 scci = importutils.try_import('scciclient.irmc.scci')
 
-CONF = cfg.CONF
-
 LOG = logging.getLogger(__name__)
 
 if scci:
diff --git a/ironic/tests/unit/common/test_swift.py b/ironic/tests/unit/common/test_swift.py
index f6961458c1..e5e91fec76 100644
--- a/ironic/tests/unit/common/test_swift.py
+++ b/ironic/tests/unit/common/test_swift.py
@@ -13,7 +13,6 @@
 # under the License.
 
 import mock
-from oslo_config import cfg
 import six
 from six.moves import builtins as __builtin__
 from six.moves import http_client
@@ -25,7 +24,6 @@ from ironic.common import exception
 from ironic.common import swift
 from ironic.tests import base
 
-CONF = cfg.CONF
 
 if six.PY3:
     import io
diff --git a/ironic/tests/unit/drivers/modules/amt/test_management.py b/ironic/tests/unit/drivers/modules/amt/test_management.py
index 7b0cfb6a21..297fa0f2b0 100644
--- a/ironic/tests/unit/drivers/modules/amt/test_management.py
+++ b/ironic/tests/unit/drivers/modules/amt/test_management.py
@@ -16,7 +16,6 @@ Test class for AMT ManagementInterface
 """
 
 import mock
-from oslo_config import cfg
 
 from ironic.common import boot_devices
 from ironic.common import exception
@@ -33,7 +32,6 @@ from ironic.tests.unit.drivers import third_party_driver_mock_specs \
 from ironic.tests.unit.objects import utils as obj_utils
 
 INFO_DICT = db_utils.get_test_amt_info()
-CONF = cfg.CONF
 
 
 @mock.patch.object(amt_common, 'pywsman', spec_set=mock_specs.PYWSMAN_SPEC)
diff --git a/ironic/tests/unit/drivers/modules/ilo/test_console.py b/ironic/tests/unit/drivers/modules/ilo/test_console.py
index 0a7206ac2a..cd55366a4a 100644
--- a/ironic/tests/unit/drivers/modules/ilo/test_console.py
+++ b/ironic/tests/unit/drivers/modules/ilo/test_console.py
@@ -16,7 +16,6 @@
 """Test class for common methods used by iLO modules."""
 
 import mock
-from oslo_config import cfg
 import six
 
 from ironic.common import exception
@@ -34,7 +33,6 @@ if six.PY3:
     file = io.BytesIO
 
 INFO_DICT = db_utils.get_test_ilo_info()
-CONF = cfg.CONF
 
 
 class IloConsoleInterfaceTestCase(db_base.DbTestCase):
diff --git a/ironic/tests/unit/drivers/modules/ilo/test_deploy.py b/ironic/tests/unit/drivers/modules/ilo/test_deploy.py
index 55b23f58da..c822b76baa 100644
--- a/ironic/tests/unit/drivers/modules/ilo/test_deploy.py
+++ b/ironic/tests/unit/drivers/modules/ilo/test_deploy.py
@@ -16,7 +16,6 @@
 """Test class for deploy methods used by iLO modules."""
 
 import mock
-from oslo_config import cfg
 import six
 
 from ironic.common import boot_devices
@@ -41,7 +40,6 @@ if six.PY3:
     file = io.BytesIO
 
 INFO_DICT = db_utils.get_test_ilo_info()
-CONF = cfg.CONF
 
 
 class IloDeployPrivateMethodsTestCase(db_base.DbTestCase):
diff --git a/ironic/tests/unit/drivers/modules/ilo/test_inspect.py b/ironic/tests/unit/drivers/modules/ilo/test_inspect.py
index af88a689c5..0c545ce2f1 100644
--- a/ironic/tests/unit/drivers/modules/ilo/test_inspect.py
+++ b/ironic/tests/unit/drivers/modules/ilo/test_inspect.py
@@ -16,7 +16,6 @@
 """Test class for Management Interface used by iLO modules."""
 
 import mock
-from oslo_config import cfg
 import six
 
 from ironic.common import exception
@@ -35,7 +34,6 @@ from ironic.tests.unit.objects import utils as obj_utils
 
 
 INFO_DICT = db_utils.get_test_ilo_info()
-CONF = cfg.CONF
 
 
 class IloInspectTestCase(db_base.DbTestCase):
diff --git a/ironic/tests/unit/drivers/modules/ilo/test_management.py b/ironic/tests/unit/drivers/modules/ilo/test_management.py
index e6683c84b8..b0c824c5c4 100644
--- a/ironic/tests/unit/drivers/modules/ilo/test_management.py
+++ b/ironic/tests/unit/drivers/modules/ilo/test_management.py
@@ -15,7 +15,6 @@
 """Test class for Management Interface used by iLO modules."""
 
 import mock
-from oslo_config import cfg
 from oslo_utils import importutils
 
 from ironic.common import boot_devices
@@ -32,7 +31,6 @@ from ironic.tests.unit.objects import utils as obj_utils
 ilo_error = importutils.try_import('proliantutils.exception')
 
 INFO_DICT = db_utils.get_test_ilo_info()
-CONF = cfg.CONF
 
 
 class IloManagementTestCase(db_base.DbTestCase):
diff --git a/ironic/tests/unit/drivers/modules/ilo/test_vendor.py b/ironic/tests/unit/drivers/modules/ilo/test_vendor.py
index 0c0a8cfe4f..52ea3f8853 100644
--- a/ironic/tests/unit/drivers/modules/ilo/test_vendor.py
+++ b/ironic/tests/unit/drivers/modules/ilo/test_vendor.py
@@ -16,7 +16,6 @@
 """Test class for vendor methods used by iLO modules."""
 
 import mock
-from oslo_config import cfg
 
 from ironic.common import exception
 from ironic.common import states
@@ -34,7 +33,6 @@ from ironic.tests.unit.objects import utils as obj_utils
 
 
 INFO_DICT = db_utils.get_test_ilo_info()
-CONF = cfg.CONF
 
 
 class VendorPassthruTestCase(db_base.DbTestCase):
diff --git a/ironic/tests/unit/drivers/modules/irmc/test_power.py b/ironic/tests/unit/drivers/modules/irmc/test_power.py
index 7f01d29931..3bd82ff12b 100644
--- a/ironic/tests/unit/drivers/modules/irmc/test_power.py
+++ b/ironic/tests/unit/drivers/modules/irmc/test_power.py
@@ -17,7 +17,7 @@ Test class for iRMC Power Driver
 """
 
 import mock
-from oslo_config import cfg
+
 from oslo_utils import uuidutils
 
 from ironic.common import exception
@@ -32,7 +32,6 @@ from ironic.tests.unit.db import utils as db_utils
 from ironic.tests.unit.objects import utils as obj_utils
 
 INFO_DICT = db_utils.get_test_irmc_info()
-CONF = cfg.CONF
 
 
 @mock.patch.object(irmc_common, 'get_irmc_client', spec_set=True,
diff --git a/ironic/tests/unit/drivers/modules/test_virtualbox.py b/ironic/tests/unit/drivers/modules/test_virtualbox.py
index 15b195fa14..2e2d54adf5 100644
--- a/ironic/tests/unit/drivers/modules/test_virtualbox.py
+++ b/ironic/tests/unit/drivers/modules/test_virtualbox.py
@@ -13,7 +13,6 @@
 """Test class for VirtualBox Driver Modules."""
 
 import mock
-from oslo_config import cfg
 from pyremotevbox import exception as pyremotevbox_exc
 from pyremotevbox import vbox as pyremotevbox_vbox
 
@@ -34,8 +33,6 @@ INFO_DICT = {
     'virtualbox_port': 12345,
 }
 
-CONF = cfg.CONF
-
 
 class VirtualBoxMethodsTestCase(db_base.DbTestCase):
 
diff --git a/ironic/tests/unit/drivers/modules/ucs/test_helper.py b/ironic/tests/unit/drivers/modules/ucs/test_helper.py
index db66a9bed9..87b91e2801 100644
--- a/ironic/tests/unit/drivers/modules/ucs/test_helper.py
+++ b/ironic/tests/unit/drivers/modules/ucs/test_helper.py
@@ -15,7 +15,6 @@
 """Test class for common methods used by UCS modules."""
 
 import mock
-from oslo_config import cfg
 from oslo_utils import importutils
 
 from ironic.common import exception
@@ -30,7 +29,6 @@ from ironic.tests.unit.objects import utils as obj_utils
 ucs_error = importutils.try_import('UcsSdk.utils.exception')
 
 INFO_DICT = db_utils.get_test_ucs_info()
-CONF = cfg.CONF
 
 
 class UcsValidateParametersTestCase(db_base.DbTestCase):
diff --git a/ironic/tests/unit/drivers/modules/ucs/test_management.py b/ironic/tests/unit/drivers/modules/ucs/test_management.py
index b4911b0557..263663aa28 100644
--- a/ironic/tests/unit/drivers/modules/ucs/test_management.py
+++ b/ironic/tests/unit/drivers/modules/ucs/test_management.py
@@ -17,7 +17,6 @@ Test class for UCS ManagementInterface
 """
 
 import mock
-from oslo_config import cfg
 from oslo_utils import importutils
 
 from ironic.common import boot_devices
@@ -33,7 +32,6 @@ from ironic.tests.unit.objects import utils as obj_utils
 ucs_error = importutils.try_import('UcsSdk.utils.exception')
 
 INFO_DICT = db_utils.get_test_ucs_info()
-CONF = cfg.CONF
 
 
 class UcsManagementTestCase(db_base.DbTestCase):