diff --git a/neutron_dynamic_routing/db/bgp_db.py b/neutron_dynamic_routing/db/bgp_db.py
index 35834362..f0063d29 100644
--- a/neutron_dynamic_routing/db/bgp_db.py
+++ b/neutron_dynamic_routing/db/bgp_db.py
@@ -16,7 +16,6 @@ import itertools
 
 import netaddr
 
-from neutron.db import common_db_mixin as common_db
 from neutron.db import l3_dvr_db
 from neutron.db.models import address_scope as address_scope_db
 from neutron.db.models import l3 as l3_db
@@ -129,7 +128,7 @@ class BgpPeer(model_base.BASEV2,
     password = sa.Column(sa.String(255), nullable=True)
 
 
-class BgpDbMixin(common_db.CommonDbMixin):
+class BgpDbMixin(object):
 
     def create_bgp_speaker(self, context, bgp_speaker):
         uuid = uuidutils.generate_uuid()
diff --git a/neutron_dynamic_routing/tests/functional/services/bgp/scheduler/test_bgp_dragent_scheduler.py b/neutron_dynamic_routing/tests/functional/services/bgp/scheduler/test_bgp_dragent_scheduler.py
index b263543d..0f0fb1c0 100644
--- a/neutron_dynamic_routing/tests/functional/services/bgp/scheduler/test_bgp_dragent_scheduler.py
+++ b/neutron_dynamic_routing/tests/functional/services/bgp/scheduler/test_bgp_dragent_scheduler.py
@@ -17,7 +17,6 @@ from neutron_lib import context
 import testscenarios
 
 from neutron.db import agents_db
-from neutron.db import common_db_mixin
 from neutron.tests.unit import testlib_api
 
 from neutron_dynamic_routing.db import bgp_db
@@ -31,8 +30,7 @@ load_tests = testscenarios.load_tests_apply_scenarios
 
 class TestAutoSchedule(testlib_api.SqlTestCase,
                        bgp_dras_db.BgpDrAgentSchedulerDbMixin,
-                       agents_db.AgentDbMixin,
-                       common_db_mixin.CommonDbMixin):
+                       agents_db.AgentDbMixin):
     """Test various scenarios for schedule_unscheduled_bgp_speakers.
 
         Below is the brief description of the scenario variables