diff --git a/ovn_bgp_agent/tests/unit/drivers/openstack/watchers/test_bgp_watcher.py b/ovn_bgp_agent/tests/unit/drivers/openstack/watchers/test_bgp_watcher.py
index 17a5d7d7..a7e6bdce 100644
--- a/ovn_bgp_agent/tests/unit/drivers/openstack/watchers/test_bgp_watcher.py
+++ b/ovn_bgp_agent/tests/unit/drivers/openstack/watchers/test_bgp_watcher.py
@@ -17,6 +17,7 @@ from unittest import mock
 
 from oslo_config import cfg
 
+from ovn_bgp_agent import config
 from ovn_bgp_agent import constants
 from ovn_bgp_agent.drivers.openstack.watchers import bgp_watcher
 from ovn_bgp_agent.tests import base as test_base
@@ -839,6 +840,7 @@ class TestOVNLBMemberCreateEvent(test_base.TestCase):
 
     def setUp(self):
         super(TestOVNLBMemberCreateEvent, self).setUp()
+        config.register_opts()
         self.chassis = '935f91fa-b8f8-47b9-8b1b-3a7a90ef7c26'
         self.agent = mock.Mock(chassis=self.chassis)
         self.agent.ovn_local_cr_lrps = {
diff --git a/ovn_bgp_agent/tests/unit/drivers/openstack/watchers/test_nb_bgp_watcher.py b/ovn_bgp_agent/tests/unit/drivers/openstack/watchers/test_nb_bgp_watcher.py
index fa3eba82..255bb254 100644
--- a/ovn_bgp_agent/tests/unit/drivers/openstack/watchers/test_nb_bgp_watcher.py
+++ b/ovn_bgp_agent/tests/unit/drivers/openstack/watchers/test_nb_bgp_watcher.py
@@ -16,15 +16,11 @@
 
 from unittest import mock
 
-from oslo_config import cfg
-
 from ovn_bgp_agent import constants
 from ovn_bgp_agent.drivers.openstack.watchers import nb_bgp_watcher
 from ovn_bgp_agent.tests import base as test_base
 from ovn_bgp_agent.tests import utils
 
-CONF = cfg.CONF
-
 
 class TestLogicalSwitchPortProviderCreateEvent(test_base.TestCase):
 
diff --git a/ovn_bgp_agent/tests/unit/test_agent.py b/ovn_bgp_agent/tests/unit/test_agent.py
index 55c4e81c..230308be 100644
--- a/ovn_bgp_agent/tests/unit/test_agent.py
+++ b/ovn_bgp_agent/tests/unit/test_agent.py
@@ -21,16 +21,18 @@ from ovn_bgp_agent.tests import base as test_base
 class TestAgent(test_base.TestCase):
 
     @mock.patch('oslo_service.service.launch')
+    @mock.patch('ovn_bgp_agent.config.register_opts')
     @mock.patch('ovn_bgp_agent.config.init')
     @mock.patch('ovn_bgp_agent.config.setup_logging')
     @mock.patch('ovn_bgp_agent.agent.BGPAgent')
-    def test_start(self, m_agent, m_setup_logging,
-                   m_config_init, m_oslo_launch):
+    def test_start(self, m_agent, m_setup_logging, m_config_init,
+                   m_register_opts, m_oslo_launch):
         m_launcher = mock.Mock()
         m_oslo_launch.return_value = m_launcher
 
         agent.start()
 
+        m_register_opts.assert_called()
         m_config_init.assert_called()
         m_setup_logging.assert_called()
         m_agent.assert_called()