diff --git a/artiq/frontend/artiq_ctlmgr.py b/artiq/frontend/artiq_ctlmgr.py
index 4d8bf2c41..bfad03ad7 100755
--- a/artiq/frontend/artiq_ctlmgr.py
+++ b/artiq/frontend/artiq_ctlmgr.py
@@ -11,7 +11,7 @@ from artiq.protocols.pc_rpc import Server
 from artiq.protocols.logging import LogForwarder, SourceFilter
 from artiq.tools import (simple_network_args, atexit_register_coroutine,
                          bind_address_from_args, add_common_args)
-from artiq.devices.master import ControllerManager
+from artiq.master.ctlmgr import ControllerManager
 
 
 def get_argparser():
diff --git a/artiq/test/test_ctlmgr.py b/artiq/test/test_ctlmgr.py
index 3090d2104..bc9031bce 100644
--- a/artiq/test/test_ctlmgr.py
+++ b/artiq/test/test_ctlmgr.py
@@ -4,7 +4,7 @@ import unittest
 import logging
 import asyncio
 
-from artiq.devices.master import Controllers
+from artiq.master.ctlmgr import Controllers
 from artiq.protocols.pc_rpc import AsyncioClient
 from artiq.tools import expect_no_log_messages