diff --git a/swh/scheduler/tests/test_scheduler.py b/swh/scheduler/tests/test_scheduler.py
--- a/swh/scheduler/tests/test_scheduler.py
+++ b/swh/scheduler/tests/test_scheduler.py
@@ -16,6 +16,7 @@
 import psycopg2
 import pytest
 
+from swh.core.api import RemoteException
 from .common import tasks_from_template, TEMPLATES, TASK_TYPES
 
 
@@ -38,7 +39,7 @@
         tt = TASK_TYPES['git']
         swh_scheduler.create_task_type(tt)
         assert tt == swh_scheduler.get_task_type(tt['type'])
-        with pytest.raises(psycopg2.IntegrityError,
+        with pytest.raises((psycopg2.IntegrityError, RemoteException),
                            match=r'\(type\)=\(%s\)' % tt['type']):
             swh_scheduler.create_task_type(tt)