diff --git a/neutron_lbaas/tests/unit/services/loadbalancer/test_agent_scheduler.py b/neutron_lbaas/tests/unit/services/loadbalancer/test_agent_scheduler.py
index d8e6e0c9f..f51560ef5 100644
--- a/neutron_lbaas/tests/unit/services/loadbalancer/test_agent_scheduler.py
+++ b/neutron_lbaas/tests/unit/services/loadbalancer/test_agent_scheduler.py
@@ -23,9 +23,8 @@ from neutron import manager
 from neutron.plugins.common import constants as plugin_const
 from neutron.tests.common import helpers
 from neutron.tests.unit.api import test_extensions
+from neutron.tests.unit.db import test_agentschedulers_db
 from neutron.tests.unit.extensions import test_agent
-from neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent \
-    import test_agent_scheduler
 from oslo_config import cfg
 import six
 from webob import exc
@@ -38,7 +37,7 @@ from neutron_lbaas.tests.unit.db.loadbalancer import test_db_loadbalancer
 LBAAS_HOSTA = 'hosta'
 
 
-class AgentSchedulerTestMixIn(test_agent_scheduler.AgentSchedulerTestMixIn):
+class AgentSchedulerTestMixIn(test_agentschedulers_db.AgentSchedulerTestMixIn):
     def _list_pools_hosted_by_lbaas_agent(self, agent_id,
                                           expected_code=exc.HTTPOk.code,
                                           admin_context=True):
diff --git a/neutron_lbaas/tests/unit/test_agent_scheduler.py b/neutron_lbaas/tests/unit/test_agent_scheduler.py
index f87d3c7ed..cf0382749 100644
--- a/neutron_lbaas/tests/unit/test_agent_scheduler.py
+++ b/neutron_lbaas/tests/unit/test_agent_scheduler.py
@@ -27,10 +27,9 @@ from neutron import manager
 from neutron.plugins.common import constants as plugin_const
 from neutron.tests.common import helpers
 from neutron.tests.unit.api import test_extensions
+from neutron.tests.unit.db import test_agentschedulers_db
 import neutron.tests.unit.extensions
 from neutron.tests.unit.extensions import test_agent
-from neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent \
-    import test_agent_scheduler
 import six
 from webob import exc
 
@@ -44,7 +43,7 @@ LBAAS_HOSTA = 'hosta'
 extensions_path = ':'.join(neutron.tests.unit.extensions.__path__)
 
 
-class AgentSchedulerTestMixIn(test_agent_scheduler.AgentSchedulerTestMixIn):
+class AgentSchedulerTestMixIn(test_agentschedulers_db.AgentSchedulerTestMixIn):
     def _list_loadbalancers_hosted_by_agent(
             self, agent_id, expected_code=exc.HTTPOk.code, admin_context=True):
         path = "/agents/%s/%s.%s" % (agent_id,