diff --git a/swh/loader/pypi/tests/test_loader.py b/swh/loader/pypi/tests/test_loader.py
--- a/swh/loader/pypi/tests/test_loader.py
+++ b/swh/loader/pypi/tests/test_loader.py
@@ -8,7 +8,7 @@
 
 import pytest
 
-from swh.loader.core.tests import BaseLoaderTest, LoaderNoStorage
+from swh.loader.core.tests import BaseLoaderTest
 from swh.loader.pypi.client import PyPIProject
 from swh.loader.pypi.loader import PyPILoader
 from swh.model import hashutil
@@ -16,7 +16,7 @@
 from .common import RESOURCES_PATH, PyPIClientWithCache
 
 
-class TestPyPILoader(LoaderNoStorage, PyPILoader):
+class TestPyPILoader(PyPILoader):
     """Real PyPILoader for test purposes (storage and pypi interactions
        inhibited)
 
@@ -41,6 +41,11 @@
             project_metadata_url=project_metadata_url,
             data=data)
 
+    def parse_config_file(self, *args, **kwargs):
+        config = super().parse_config_file(*args, **kwargs)
+        config['storage'] = {'cls': 'memory', 'args': {}}
+        return config
+
     def prepare(self, project_name, origin_url,
                 origin_metadata_url=None):
         self.project_name = project_name
@@ -81,6 +86,7 @@
               dummy_pypi_instance='https://dummy.org'):
         super().setUp(project_name, dummy_pypi_instance)
         self.loader = PyPILoaderNoSnapshot(project_name=project_name)
+        self.storage = self.loader.storage
 
     def test_load(self):
         """Load a pypi origin
@@ -111,10 +117,12 @@
         self.assertContentsOk(expected_contents)
 
         expected_directories = [
-            '05219ba38bc542d4345d5638af1ed56c7d43ca7d',
-            'cf019eb456cf6f78d8c4674596f1c9a97ece8f44',
-            'b178b66bd22383d5f16f4f5c923d39ca798861b4',
-            'c3a58f8b57433a4b56caaa5033ae2e0931405338',
+            {'id': hashutil.hash_to_bytes(id_)} for id_ in [
+                '05219ba38bc542d4345d5638af1ed56c7d43ca7d',
+                'cf019eb456cf6f78d8c4674596f1c9a97ece8f44',
+                'b178b66bd22383d5f16f4f5c923d39ca798861b4',
+                'c3a58f8b57433a4b56caaa5033ae2e0931405338',
+            ]
         ]
         self.assertDirectoriesOk(expected_directories)
 
@@ -200,6 +208,7 @@
               dummy_pypi_instance='https://dummy.org'):
         super().setUp(project_name, dummy_pypi_instance)
         self.loader = PyPILoaderWithSnapshot(project_name=project_name)
+        self.storage = self.loader.storage
 
     def test_load(self):
         """Load a PyPI origin without new changes results in 1 same snapshot
@@ -264,6 +273,7 @@
         self.loader = PyPILoaderWithSnapshot(
             project_name=project_name,
             json_filename='0805nexter+new-made-up-release.json')
+        self.storage = self.loader.storage
 
     def test_load(self):
         """Load a PyPI origin with changes results in 1 new snapshot
@@ -293,8 +303,10 @@
         self.assertContentsOk(expected_contents)
 
         expected_directories = [
-            'e226e7e4ad03b4fc1403d69a18ebdd6f2edd2b3a',
-            '52604d46843b898f5a43208045d09fcf8731631b',
+            {'id': hashutil.hash_to_bytes(id_)} for id_ in [
+                'e226e7e4ad03b4fc1403d69a18ebdd6f2edd2b3a',
+                '52604d46843b898f5a43208045d09fcf8731631b',
+            ]
         ]
         self.assertDirectoriesOk(expected_directories)
 
@@ -408,6 +420,7 @@
         self.loader = PyPILoaderWithSnapshot2(
             project_name=project_name,
             json_filename='0805nexter-unpublished-release.json')
+        self.storage = self.loader.storage
 
     def test_load(self):
         """Load PyPI origin with removed artifact + changes ~> 1 new snapshot
@@ -438,8 +451,10 @@
         self.assertContentsOk(expected_contents)
 
         expected_directories = [
-            'a2b7621f3e52eb3632657f6e3436bd08202db56f',  # new one
-            '770e21215ecac53cea331d8ea4dc0ffc9d979367',
+            {'id': hashutil.hash_to_bytes(id_)} for id_ in [
+                'a2b7621f3e52eb3632657f6e3436bd08202db56f',  # new one
+                '770e21215ecac53cea331d8ea4dc0ffc9d979367',
+            ]
         ]
         self.assertDirectoriesOk(expected_directories)