diff --git a/neutron/plugins/ml2/drivers/linuxbridge/agent/common/config.py b/neutron/plugins/ml2/drivers/linuxbridge/agent/common/config.py
index 1739f6d961e..cdc185b481e 100644
--- a/neutron/plugins/ml2/drivers/linuxbridge/agent/common/config.py
+++ b/neutron/plugins/ml2/drivers/linuxbridge/agent/common/config.py
@@ -13,6 +13,7 @@
 #    under the License.
 
 from neutron.conf.plugins.ml2.drivers import linuxbridge
+from neutron.plugins.ml2.drivers.agent import config as cagt_config  # noqa
 
 
 linuxbridge.register_linuxbridge_opts()
diff --git a/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
index 1c11f0c82fc..8941a9e9967 100644
--- a/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
+++ b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
@@ -44,7 +44,6 @@ from neutron.conf.agent import common as agent_config
 from neutron.conf import service as service_conf
 from neutron.plugins.ml2.drivers.agent import _agent_manager_base as amb
 from neutron.plugins.ml2.drivers.agent import _common_agent as ca
-from neutron.plugins.ml2.drivers.agent import config as cagt_config  # noqa
 from neutron.plugins.ml2.drivers.l2pop.rpc_manager \
     import l2population_rpc as l2pop_rpc
 from neutron.plugins.ml2.drivers.linuxbridge.agent import arp_protect
diff --git a/neutron/plugins/ml2/drivers/mech_sriov/agent/common/config.py b/neutron/plugins/ml2/drivers/mech_sriov/agent/common/config.py
index 39674ed4edd..2daa7820212 100644
--- a/neutron/plugins/ml2/drivers/mech_sriov/agent/common/config.py
+++ b/neutron/plugins/ml2/drivers/mech_sriov/agent/common/config.py
@@ -14,13 +14,10 @@
 # limitations under the License.
 
 
-from oslo_config import cfg
-
 from neutron._i18n import _
-from neutron.conf.agent import common as config
-from neutron.conf.plugins.ml2.drivers import agent
 from neutron.conf.plugins.ml2.drivers.mech_sriov import agent_common as \
      agent_common_config
+from neutron.plugins.ml2.drivers.agent import config as cagt_config  # noqa
 
 
 def parse_exclude_devices(exclude_list):
@@ -55,6 +52,4 @@ def parse_exclude_devices(exclude_list):
     return exclude_mapping
 
 
-agent.register_agent_opts()
 agent_common_config.register_agent_sriov_nic_opts()
-config.register_agent_state_opts_helper(cfg.CONF)
diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py b/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py
index 0cfb0ef46d7..6d5a2d54e37 100644
--- a/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py
@@ -12,12 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_config import cfg
-
-from neutron.conf.agent import common as config
-from neutron.conf.plugins.ml2.drivers import agent
 from neutron.conf.plugins.ml2.drivers import ovs_conf
+from neutron.plugins.ml2.drivers.agent import config as cagt_config  # noqa
+
 
-agent.register_agent_opts()
 ovs_conf.register_ovs_agent_opts()
-config.register_agent_state_opts_helper(cfg.CONF)