diff --git a/neutron/cmd/agents/dhcp.py b/neutron/cmd/eventlet/agents/dhcp.py
similarity index 100%
rename from neutron/cmd/agents/dhcp.py
rename to neutron/cmd/eventlet/agents/dhcp.py
diff --git a/neutron/tests/fullstack/agents/dhcp_agent.py b/neutron/tests/fullstack/agents/dhcp_agent.py
index 3a522d48bc3..20509b1ace8 100755
--- a/neutron/tests/fullstack/agents/dhcp_agent.py
+++ b/neutron/tests/fullstack/agents/dhcp_agent.py
@@ -21,7 +21,7 @@ from oslo_config import cfg
 from oslo_utils import uuidutils
 
 from neutron.agent.linux import dhcp as linux_dhcp
-from neutron.cmd.agents import dhcp as dhcp_agent
+from neutron.cmd.eventlet.agents import dhcp as dhcp_agent
 from neutron.common import config
 
 
diff --git a/setup.cfg b/setup.cfg
index c1fda4164a3..41fb0bd104f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -34,7 +34,7 @@ wsgi_scripts =
     neutron-api = neutron.cmd.server:main_api_uwsgi
 console_scripts =
     neutron-db-manage = neutron.db.migration.cli:main
-    neutron-dhcp-agent = neutron.cmd.agents.dhcp:main
+    neutron-dhcp-agent = neutron.cmd.eventlet.agents.dhcp:main
     neutron-keepalived-state-change = neutron.cmd.keepalived_state_change:main
     neutron-ipset-cleanup = neutron.cmd.ipset_cleanup:main
     neutron-l3-agent = neutron.cmd.eventlet.agents.l3:main