diff --git a/conftest.py b/conftest.py
--- a/conftest.py
+++ b/conftest.py
@@ -19,10 +19,10 @@
         'storage': {
             'cls': 'pipeline',
             'steps': [
+                {'cls': 'validate'},
                 {'cls': 'retry'},
                 {'cls': 'filter'},
                 {'cls': 'buffer'},
-                {'cls': 'validate'},
                 {
                     'cls': 'local',
                     'args': {
diff --git a/swh/loader/core/tests/test_loader.py b/swh/loader/core/tests/test_loader.py
--- a/swh/loader/core/tests/test_loader.py
+++ b/swh/loader/core/tests/test_loader.py
@@ -45,13 +45,13 @@
                 'cls': 'pipeline',
                 'steps': [
                     {
-                        'cls': 'retry',
+                        'cls': 'validate',
                     },
                     {
-                        'cls': 'filter',
+                        'cls': 'retry',
                     },
                     {
-                        'cls': 'validate',
+                        'cls': 'filter',
                     },
                     {
                         'cls': 'memory',
@@ -71,6 +71,9 @@
             'storage': {
                 'cls': 'pipeline',
                 'steps': [
+                    {
+                        'cls': 'validate',
+                    },
                     {
                         'cls': 'retry',
                     },
@@ -87,9 +90,6 @@
                             'release': 2,
                         },
                     },
-                    {
-                        'cls': 'validate',
-                    },
                     {
                         'cls': 'memory',
                     },