diff --git a/keystone/cmd/cli.py b/keystone/cmd/cli.py
index a2f497a1a8..8a2b384560 100644
--- a/keystone/cmd/cli.py
+++ b/keystone/cmd/cli.py
@@ -22,7 +22,6 @@ from oslo_log import log
 from oslo_serialization import jsonutils
 import pbr.version
 
-from keystone import backends
 from keystone.common import driver_hints
 from keystone.common import openssl
 from keystone.common import sql
@@ -31,6 +30,7 @@ from keystone.common import utils
 from keystone import config
 from keystone import exception
 from keystone.i18n import _, _LW
+from keystone.server import backends
 from keystone import token
 
 
diff --git a/keystone/backends.py b/keystone/server/backends.py
similarity index 100%
rename from keystone/backends.py
rename to keystone/server/backends.py
diff --git a/keystone/server/common.py b/keystone/server/common.py
index fda44eea02..2de6d39eef 100644
--- a/keystone/server/common.py
+++ b/keystone/server/common.py
@@ -14,10 +14,10 @@
 
 from oslo_config import cfg
 
-from keystone import backends
 from keystone.common import dependency
 from keystone.common import sql
 from keystone import config
+from keystone.server import backends
 
 
 CONF = cfg.CONF