diff --git a/swh/storage/api/server.py b/swh/storage/api/server.py
--- a/swh/storage/api/server.py
+++ b/swh/storage/api/server.py
@@ -9,9 +9,10 @@
 from flask import Flask, g, request
 
 from swh.core import config
-from .. import Storage
-from ..api.common import (BytesRequest, decode_request, error_handler,
-                          encode_data_server as encode_data)
+from swh.storage import Storage
+from swh.storage.api.common import (BytesRequest, decode_request,
+                                    error_handler,
+                                    encode_data_server as encode_data)
 
 DEFAULT_CONFIG = {
     'db': ('str', 'dbname=softwareheritage-dev'),
diff --git a/swh/storage/objstorage/api/server.py b/swh/storage/objstorage/api/server.py
--- a/swh/storage/objstorage/api/server.py
+++ b/swh/storage/objstorage/api/server.py
@@ -7,9 +7,10 @@
 from flask import Flask, g, request
 
 from swh.core import config
-from .. import ObjStorage
-from ...api.common import (BytesRequest, decode_request, error_handler,
-                           encode_data_server as encode_data)
+from swh.storage.objstorage import ObjStorage
+from swh.storage.api.common import (BytesRequest, decode_request,
+                                    error_handler,
+                                    encode_data_server as encode_data)
 
 DEFAULT_CONFIG = {
     'storage_base': ('str', '/tmp/swh-storage/objects/'),