diff --git a/swh/storage/tests/test_api_client.py b/swh/storage/tests/test_api_client.py
--- a/swh/storage/tests/test_api_client.py
+++ b/swh/storage/tests/test_api_client.py
@@ -10,11 +10,12 @@
 import pytest
 
 from swh.core.api.tests.server_testing import ServerTestFixture
-from swh.journal import writer
-from swh.storage.in_memory import Storage as InMemoryStorage
+from swh.journal.writer import get_journal_writer
 from swh.storage.api.client import RemoteStorage
 import swh.storage.api.server as server
 from swh.storage.api.server import app
+from swh.storage.in_memory import Storage as InMemoryStorage
+import swh.storage.storage
 from swh.storage.tests.test_storage import \
     CommonTestStorage, CommonPropTestStorage, StorageTestDbFixture
 
@@ -22,7 +23,7 @@
 class RemotePgStorageFixture(StorageTestDbFixture, ServerTestFixture,
                              unittest.TestCase):
     def setUp(self):
-        journal_writer = writer.get_journal_writer(cls='inmemory')
+        journal_writer = get_journal_writer(cls='inmemory')
 
         def mock_get_journal_writer(cls, args=None):
             assert cls == 'inmemory'
@@ -30,8 +31,8 @@
 
         self.journal_writer = journal_writer
         server.storage = None
-        self.get_journal_writer = writer.get_journal_writer
-        writer.get_journal_writer = mock_get_journal_writer
+        self.get_journal_writer = get_journal_writer
+        swh.storage.storage.get_journal_writer = mock_get_journal_writer
 
         # ServerTestFixture needs to have self.objroot for
         # setUp() method, but this field is defined in
@@ -65,7 +66,7 @@
     def tearDown(self):
         super().tearDown()
         shutil.rmtree(self.storage_base)
-        writer.get_journal_writer = self.get_journal_writer
+        swh.storage.storage.get_journal_writer = self.get_journal_writer
 
     def reset_storage(self):
         excluded = {'dbversion', 'tool'}