diff --git a/neutron/plugins/ml2/drivers/l2pop/config.py b/neutron/conf/plugins/ml2/drivers/l2pop.py
similarity index 89%
rename from neutron/plugins/ml2/drivers/l2pop/config.py
rename to neutron/conf/plugins/ml2/drivers/l2pop.py
index d8d685d24e9..a8b6f23ec3d 100644
--- a/neutron/plugins/ml2/drivers/l2pop/config.py
+++ b/neutron/conf/plugins/ml2/drivers/l2pop.py
@@ -24,4 +24,6 @@ l2_population_options = [
                       'existing ports whent it restarts')),
 ]
 
-cfg.CONF.register_opts(l2_population_options, "l2pop")
+
+def register_l2_population_opts(cfg=cfg.CONF):
+    cfg.register_opts(l2_population_options, "l2pop")
diff --git a/neutron/plugins/ml2/drivers/l2pop/mech_driver.py b/neutron/plugins/ml2/drivers/l2pop/mech_driver.py
index b547019df8c..1892d9d9b95 100644
--- a/neutron/plugins/ml2/drivers/l2pop/mech_driver.py
+++ b/neutron/plugins/ml2/drivers/l2pop/mech_driver.py
@@ -20,16 +20,18 @@ from oslo_config import cfg
 from oslo_log import log as logging
 
 from neutron._i18n import _, _LW
+from neutron.conf.plugins.ml2.drivers import l2pop as config
 from neutron import context as n_context
 from neutron.db import api as db_api
 from neutron.db import l3_hamode_db
 from neutron.plugins.ml2 import driver_api as api
-from neutron.plugins.ml2.drivers.l2pop import config  # noqa
 from neutron.plugins.ml2.drivers.l2pop import db as l2pop_db
 from neutron.plugins.ml2.drivers.l2pop import rpc as l2pop_rpc
 
 LOG = logging.getLogger(__name__)
 
+config.register_l2_population_opts()
+
 
 class L2populationMechanismDriver(api.MechanismDriver):