diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@
                python3-swh.core (>= 0.0.36~),
                python3-swh.model (>= 0.0.26~),
                python3-swh.loader.core (>= 0.0.32~),
-               python3-swh.loader.tar (>= 0.0.35~),
+               python3-swh.loader.tar (>= 0.0.37~),
                python3-swh.scheduler (>= 0.0.26~),
                python3-django,
                python3-click,
@@ -49,7 +49,7 @@
          python3-swh.core (>= 0.0.36~),
          python3-swh.model (>= 0.0.26~),
          python3-swh.loader.core (>= 0.0.32~),
-         python3-swh.loader.tar (>= 0.0.35~),
+         python3-swh.loader.tar (>= 0.0.37~),
          python3-swh.scheduler (>= 0.0.26~),
          ${misc:Depends}, ${python3:Depends}
 Description: Software Heritage Deposit Loader
diff --git a/requirements-swh.txt b/requirements-swh.txt
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,5 +1,5 @@
 swh.core >= 0.0.36
-swh.loader.tar >= 0.0.35
+swh.loader.tar >= 0.0.37
 swh.loader.core >= 0.0.32
 swh.scheduler >= 0.0.26
 swh.model >= 0.0.26
diff --git a/swh/deposit/loader/loader.py b/swh/deposit/loader/loader.py
--- a/swh/deposit/loader/loader.py
+++ b/swh/deposit/loader/loader.py
@@ -13,7 +13,7 @@
 from ..client import PrivateApiDepositClient
 
 
-class DepositLoader(loader.TarLoader):
+class DepositLoader(loader.LegacyLocalTarLoader):
     """Deposit loader implementation.
 
     This is a subclass of the :class:TarLoader as the main goal of
@@ -38,7 +38,7 @@
     def __init__(self, client=None):
         super().__init__(
             logging_class='swh.deposit.loader.loader.DepositLoader')
-        self.client = client if client else PrivateApiDepositClient()
+        self.deposit_client = client if client else PrivateApiDepositClient()
 
     def load(self, *, archive_url, deposit_meta_url, deposit_update_url):
         return BufferedLoader.load(
@@ -48,7 +48,7 @@
             deposit_update_url=deposit_update_url)
 
     def prepare_origin_visit(self, *, deposit_meta_url, **kwargs):
-        self.metadata = self.client.metadata_get(
+        self.metadata = self.deposit_client.metadata_get(
             deposit_meta_url, log=self.log)
         self.origin = self.metadata['origin']
         self.visit_date = None
@@ -59,12 +59,12 @@
 
         """
         self.deposit_update_url = deposit_update_url
-        self.client.status_update(deposit_update_url, 'loading')
+        self.deposit_client.status_update(deposit_update_url, 'loading')
 
         temporary_directory = tempfile.TemporaryDirectory()
         self.temporary_directory = temporary_directory
         archive_path = os.path.join(temporary_directory.name, 'archive.zip')
-        archive = self.client.archive_get(
+        archive = self.deposit_client.archive_get(
             archive_url, archive_path, log=self.log)
 
         metadata = self.metadata
@@ -106,8 +106,8 @@
         """
         try:
             if not success:
-                self.client.status_update(self.deposit_update_url,
-                                          status='failed')
+                self.deposit_client.status_update(self.deposit_update_url,
+                                                  status='failed')
                 return
 
             revisions = self.objects['revision']
@@ -123,7 +123,7 @@
 
             # update the deposit's status to success with its
             # revision-id and directory-id
-            self.client.status_update(
+            self.deposit_client.status_update(
                 self.deposit_update_url,
                 status='done',
                 revision_id=rev_id,
diff --git a/swh/deposit/tests/__init__.py b/swh/deposit/tests/__init__.py
--- a/swh/deposit/tests/__init__.py
+++ b/swh/deposit/tests/__init__.py
@@ -37,6 +37,8 @@
 
 TEST_LOADER_CONFIG = {
     'extraction_dir': '/tmp/swh-loader-tar/test/',
+    'working_dir': '/tmp/swh-loader-tar/test/working-dir',
+    'debug': False,
     'storage': {
         'cls': 'memory',
         'args': {