diff --git a/neutron/tests/base.py b/neutron/tests/base.py
index 7b18901044b..f55dbeab3b1 100644
--- a/neutron/tests/base.py
+++ b/neutron/tests/base.py
@@ -238,10 +238,10 @@ class BaseTestCase(DietTestCase):
     @staticmethod
     def config_parse(conf=None, args=None):
         """Create the default configurations."""
-        # neutron.conf.test includes rpc_backend which needs to be cleaned up
+        # neutron.conf includes rpc_backend which needs to be cleaned up
         if args is None:
             args = []
-        args += ['--config-file', etcdir('neutron.conf.test')]
+        args += ['--config-file', etcdir('neutron.conf')]
         if conf is None:
             config.init(args=args)
         else:
diff --git a/neutron/tests/etc/neutron.conf.test b/neutron/tests/etc/neutron.conf
similarity index 100%
rename from neutron/tests/etc/neutron.conf.test
rename to neutron/tests/etc/neutron.conf
diff --git a/neutron/tests/unit/agent/dhcp/test_agent.py b/neutron/tests/unit/agent/dhcp/test_agent.py
index 64da28398f1..a068ea01634 100644
--- a/neutron/tests/unit/agent/dhcp/test_agent.py
+++ b/neutron/tests/unit/agent/dhcp/test_agent.py
@@ -236,7 +236,7 @@ class TestDhcpAgent(base.BaseTestCase):
                     with mock.patch.object(sys, 'argv') as sys_argv:
                         sys_argv.return_value = [
                             'dhcp', '--config-file',
-                            base.etcdir('neutron.conf.test')]
+                            base.etcdir('neutron.conf')]
                         cfg.CONF.register_opts(dhcp_config.DHCP_AGENT_OPTS)
                         config.register_interface_driver_opts_helper(cfg.CONF)
                         config.register_agent_state_opts_helper(cfg.CONF)
@@ -260,7 +260,7 @@ class TestDhcpAgent(base.BaseTestCase):
             with mock.patch.object(sys, 'argv') as sys_argv:
                 with mock.patch(launcher_str) as launcher:
                     sys_argv.return_value = ['dhcp', '--config-file',
-                                             base.etcdir('neutron.conf.test')]
+                                             base.etcdir('neutron.conf')]
                     entry.main()
                     launcher.assert_has_calls(
                         [mock.call(), mock.call().launch_service(mock.ANY),
diff --git a/neutron/tests/unit/api/test_extensions.py b/neutron/tests/unit/api/test_extensions.py
index aabece09d4c..9a32e865f94 100644
--- a/neutron/tests/unit/api/test_extensions.py
+++ b/neutron/tests/unit/api/test_extensions.py
@@ -726,7 +726,7 @@ class ExtensionExtendedAttributeTestCase(base.BaseTestCase):
             "ExtensionExtendedAttributeTestPlugin"
         )
 
-        # point config file to: neutron/tests/etc/neutron.conf.test
+        # point config file to: neutron/tests/etc/neutron.conf
         self.config_parse()
 
         self.setup_coreplugin(plugin)
diff --git a/neutron/tests/unit/db/test_db_base_plugin_v2.py b/neutron/tests/unit/db/test_db_base_plugin_v2.py
index 775426cfed2..a73753ce182 100644
--- a/neutron/tests/unit/db/test_db_base_plugin_v2.py
+++ b/neutron/tests/unit/db/test_db_base_plugin_v2.py
@@ -164,7 +164,7 @@ class NeutronDbPluginV2TestCase(testlib_api.WebTestCase):
 
     def setup_config(self):
         # Create the default configurations
-        args = ['--config-file', base.etcdir('neutron.conf.test')]
+        args = ['--config-file', base.etcdir('neutron.conf')]
         # If test_config specifies some config-file, use it, as well
         for config_file in test_lib.test_config.get('config_files', []):
             args.extend(['--config-file', config_file])
diff --git a/tox.ini b/tox.ini
index 636a2a37739..a33e89a23b2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -72,7 +72,7 @@ commands=
   # Checks for coding and style guidelines
   flake8
   sh ./tools/coding-checks.sh --pylint '{posargs}'
-  neutron-db-manage check_migration
+  neutron-db-manage --config-file neutron/tests/etc/neutron.conf check_migration
 whitelist_externals =
   sh
   bash