diff --git a/neutron/service.py b/neutron/service.py
index 7c83aa2f821..47db6a8440a 100644
--- a/neutron/service.py
+++ b/neutron/service.py
@@ -33,7 +33,6 @@ from oslo_utils import excutils
 from oslo_utils import importutils
 
 from neutron._i18n import _LE, _LI
-from neutron.callbacks import events as n_events
 from neutron.common import config
 from neutron.common import profiler
 from neutron.common import rpc as n_rpc
@@ -264,8 +263,7 @@ def _start_workers(workers):
 def start_all_workers():
     workers = _get_rpc_workers() + _get_plugins_workers()
     launcher = _start_workers(workers)
-    # TODO(yamahata): replace n_events with neutron_lib.callback.events
-    registry.notify(resources.PROCESS, n_events.AFTER_SPAWN, None)
+    registry.notify(resources.PROCESS, events.AFTER_SPAWN, None)
     return launcher
 
 
diff --git a/neutron/tests/unit/test_service.py b/neutron/tests/unit/test_service.py
index 31ffab2533e..fb700400b28 100644
--- a/neutron/tests/unit/test_service.py
+++ b/neutron/tests/unit/test_service.py
@@ -15,11 +15,11 @@
 
 import mock
 
+from neutron_lib.callbacks import events
 from neutron_lib.callbacks import registry
 from neutron_lib.callbacks import resources
 from oslo_config import cfg
 
-from neutron.callbacks import events as n_events
 from neutron import service
 from neutron.tests import base
 from neutron.tests.unit import test_wsgi
@@ -66,8 +66,7 @@ class TestRunWsgiApp(base.BaseTestCase):
         mock.patch.object(service, '_start_workers').start()
 
         callback = mock.Mock()
-        # TODO(yamahata): replace n_events with neutron_lib.callback.events
-        registry.subscribe(callback, resources.PROCESS, n_events.AFTER_SPAWN)
+        registry.subscribe(callback, resources.PROCESS, events.AFTER_SPAWN)
         service.start_all_workers()
         callback.assert_called_once_with(
-            resources.PROCESS, n_events.AFTER_SPAWN, mock.ANY)
+            resources.PROCESS, events.AFTER_SPAWN, mock.ANY)