diff --git a/conftest.py b/conftest.py
index 3375fe2..e9d27de 100644
--- a/conftest.py
+++ b/conftest.py
@@ -1,67 +1,73 @@
-# Copyright (C) 2019  The Software Heritage developers
+# Copyright (C) 2019-2020  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import os
 import pytest
 import yaml
 
 from typing import Any, Dict
 
 from swh.storage.tests.conftest import * # noqa
 from swh.scheduler.tests.conftest import *  # noqa
 
 
 @pytest.fixture
 def swh_loader_config(swh_storage_postgresql) -> Dict[str, Any]:
     return {
         'storage': {
-            'cls': 'local',
-            'args': {
-                'db': swh_storage_postgresql.dsn,
-                'objstorage': {
-                    'cls': 'memory',
-                    'args': {}
-                },
-            },
+            'cls': 'pipeline',
+            'steps': [
+                {'cls': 'retry'},
+                {
+                    'cls': 'local',
+                    'args': {
+                        'db': swh_storage_postgresql.dsn,
+                        'objstorage': {
+                            'cls': 'memory',
+                            'args': {}
+                        },
+                    }
+                }
+            ]
         },
         'deposit': {
             'url': 'https://deposit.softwareheritage.org/1/private',
             'auth': {
                 'username': 'user',
                 'password': 'pass',
             }
         },
     }
 
 
 @pytest.fixture
 def swh_config(swh_loader_config, monkeypatch, tmp_path):
     conffile = os.path.join(str(tmp_path), 'loader.yml')
     with open(conffile, 'w') as f:
         f.write(yaml.dump(swh_loader_config))
     monkeypatch.setenv('SWH_CONFIG_FILENAME', conffile)
     return conffile
 
 
 @pytest.fixture(autouse=True, scope='session')
 def swh_proxy():
     """Automatically inject this fixture in all tests to ensure no outside
        connection takes place.
 
     """
     os.environ['http_proxy'] = 'http://localhost:999'
     os.environ['https_proxy'] = 'http://localhost:999'
 
 
 @pytest.fixture(scope='session')  # type: ignore  # expected redefinition
 def celery_includes():
     return [
         'swh.loader.package.archive.tasks',
         'swh.loader.package.cran.tasks',
         'swh.loader.package.debian.tasks',
         'swh.loader.package.deposit.tasks',
         'swh.loader.package.npm.tasks',
         'swh.loader.package.pypi.tasks',
     ]
diff --git a/requirements-swh.txt b/requirements-swh.txt
index ebe8e8b..77c3d83 100644
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,4 +1,4 @@
 swh.core >= 0.0.75
 swh.model >= 0.0.18
 swh.scheduler
-swh.storage >= 0.0.160
+swh.storage >= 0.0.163