diff --git a/octavia/amphorae/drivers/haproxy/rest_api_driver.py b/octavia/amphorae/drivers/haproxy/rest_api_driver.py
index 1b2bd59324..479804b1d7 100644
--- a/octavia/amphorae/drivers/haproxy/rest_api_driver.py
+++ b/octavia/amphorae/drivers/haproxy/rest_api_driver.py
@@ -24,7 +24,7 @@ import six
 from stevedore import driver as stevedore_driver
 
 from octavia.amphorae.driver_exceptions import exceptions as driver_except
-from octavia.amphorae.drivers import driver_base as driver_base
+from octavia.amphorae.drivers import driver_base
 from octavia.amphorae.drivers.haproxy import exceptions as exc
 from octavia.amphorae.drivers.keepalived import vrrp_rest_driver
 from octavia.common.config import cfg
diff --git a/octavia/amphorae/drivers/keepalived/vrrp_rest_driver.py b/octavia/amphorae/drivers/keepalived/vrrp_rest_driver.py
index 7835830fbd..a7f6ed4129 100644
--- a/octavia/amphorae/drivers/keepalived/vrrp_rest_driver.py
+++ b/octavia/amphorae/drivers/keepalived/vrrp_rest_driver.py
@@ -15,7 +15,7 @@
 from oslo_log import log as logging
 import six
 
-from octavia.amphorae.drivers import driver_base as driver_base
+from octavia.amphorae.drivers import driver_base
 from octavia.amphorae.drivers.keepalived.jinja import jinja_cfg
 from octavia.common import constants
 
diff --git a/octavia/amphorae/drivers/noop_driver/driver.py b/octavia/amphorae/drivers/noop_driver/driver.py
index f4e4394e67..ea5dd3802a 100644
--- a/octavia/amphorae/drivers/noop_driver/driver.py
+++ b/octavia/amphorae/drivers/noop_driver/driver.py
@@ -14,7 +14,7 @@
 
 from oslo_log import log as logging
 
-from octavia.amphorae.drivers import driver_base as driver_base
+from octavia.amphorae.drivers import driver_base
 
 LOG = logging.getLogger(__name__)
 
diff --git a/octavia/common/tls_utils/cert_parser.py b/octavia/common/tls_utils/cert_parser.py
index e61008796b..5b2ac8e378 100644
--- a/octavia/common/tls_utils/cert_parser.py
+++ b/octavia/common/tls_utils/cert_parser.py
@@ -24,7 +24,7 @@ from pyasn1.codec.der import encoder as der_encoder
 from pyasn1_modules import rfc2315
 import six
 
-from octavia.common import data_models as data_models
+from octavia.common import data_models
 import octavia.common.exceptions as exceptions
 
 X509_BEG = b'-----BEGIN CERTIFICATE-----'
diff --git a/octavia/tests/unit/amphorae/drivers/haproxy/test_rest_api_driver.py b/octavia/tests/unit/amphorae/drivers/haproxy/test_rest_api_driver.py
index 7922ad2136..f9efec4b3e 100644
--- a/octavia/tests/unit/amphorae/drivers/haproxy/test_rest_api_driver.py
+++ b/octavia/tests/unit/amphorae/drivers/haproxy/test_rest_api_driver.py
@@ -26,7 +26,7 @@ from octavia.amphorae.drivers.haproxy import exceptions as exc
 from octavia.amphorae.drivers.haproxy import rest_api_driver as driver
 from octavia.db import models
 from octavia.network import data_models as network_models
-from octavia.tests.unit import base as base
+from octavia.tests.unit import base
 from octavia.tests.unit.common.sample_configs import sample_certs
 from octavia.tests.unit.common.sample_configs import sample_configs
 
diff --git a/octavia/tests/unit/common/jinja/haproxy/test_jinja_cfg.py b/octavia/tests/unit/common/jinja/haproxy/test_jinja_cfg.py
index bd90a4e196..7dee98ce03 100644
--- a/octavia/tests/unit/common/jinja/haproxy/test_jinja_cfg.py
+++ b/octavia/tests/unit/common/jinja/haproxy/test_jinja_cfg.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 from octavia.common.jinja.haproxy import jinja_cfg
-from octavia.tests.unit import base as base
+from octavia.tests.unit import base
 from octavia.tests.unit.common.sample_configs import sample_configs
 
 
diff --git a/octavia/tests/unit/compute/drivers/test_compute_noop_driver.py b/octavia/tests/unit/compute/drivers/test_compute_noop_driver.py
index 51fead50af..42d39a8f6d 100644
--- a/octavia/tests/unit/compute/drivers/test_compute_noop_driver.py
+++ b/octavia/tests/unit/compute/drivers/test_compute_noop_driver.py
@@ -14,7 +14,7 @@
 
 from oslo_utils import uuidutils
 
-from octavia.compute.drivers.noop_driver import driver as driver
+from octavia.compute.drivers.noop_driver import driver
 import octavia.tests.unit.base as base
 
 
diff --git a/octavia/tests/unit/network/drivers/test_network_noop_driver.py b/octavia/tests/unit/network/drivers/test_network_noop_driver.py
index 546bf2cc52..3299ec7976 100644
--- a/octavia/tests/unit/network/drivers/test_network_noop_driver.py
+++ b/octavia/tests/unit/network/drivers/test_network_noop_driver.py
@@ -15,8 +15,8 @@
 import mock
 from oslo_utils import uuidutils
 
-from octavia.db import models as models
-from octavia.network.drivers.noop_driver import driver as driver
+from octavia.db import models
+from octavia.network.drivers.noop_driver import driver
 import octavia.tests.unit.base as base