diff --git a/swh/loader/core/loader.py b/swh/loader/core/loader.py
--- a/swh/loader/core/loader.py
+++ b/swh/loader/core/loader.py
@@ -230,8 +230,7 @@
     @retry(retry_on_exception=retry_loading, stop_max_attempt_number=3)
     def send_origin(self, origin):
         log_id = str(uuid.uuid4())
-        self.log.debug('Creating %s origin for %s' % (origin['type'],
-                                                      origin['url']),
+        self.log.debug('Creating origin for %s' % origin['url'],
                        extra={
                            'swh_type': 'storage_send_start',
                            'swh_content_type': 'origin',
@@ -239,8 +238,7 @@
                            'swh_id': log_id
                        })
         self.storage.origin_add_one(origin)
-        self.log.debug('Done creating %s origin for %s' % (origin['type'],
-                                                           origin['url']),
+        self.log.debug('Done creating origin for %s' % origin['url'],
                        extra={
                            'swh_type': 'storage_send_end',
                            'swh_content_type': 'origin',
diff --git a/swh/loader/core/tests/__init__.py b/swh/loader/core/tests/__init__.py
--- a/swh/loader/core/tests/__init__.py
+++ b/swh/loader/core/tests/__init__.py
@@ -134,20 +134,18 @@
         }
         self.assertEqual(expected_branches, branches)
 
-    def assertOriginMetadataContains(self, origin_type, origin_url,
+    def assertOriginMetadataContains(self, origin_url,
                                      expected_origin_metadata):
         """Check the storage contains this metadata for the given origin.
 
         Args:
 
-            origin_type (str): type of origin ('deposit', 'git', 'svn', ...)
             origin_url (str): URL of the origin
             expected_origin_metadata (dict):
                               Extrinsic metadata of the origin
                               <https://forge.softwareheritage.org/T1344>
         """
-        origin = self.storage.origin_get(
-                dict(type=origin_type, url=origin_url))
+        origin = self.storage.origin_get({'url': origin_url})
         results = self.storage.origin_metadata_get_by(origin['url'])
         self.assertEqual(len(results), 1, results)
         result = results[0]
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
@@ -34,7 +34,9 @@
         self.origin = origin
         self.origin_url = origin['url']
         self.visit_date = datetime.datetime.utcnow()
-        self.storage.origin_visit_add(origin['id'], self.visit_date)
+        self.visit_type = 'git'
+        self.storage.origin_visit_add(origin['id'], self.visit_date,
+                                      self.visit_type)
 
     def parse_config_file(self, *args, **kwargs):
         return {
@@ -314,19 +316,16 @@
             self.loader.visit_date, provider_id,
             tool_id, {'test_metadata': 'foobar'})
 
-        self.assertOriginMetadataContains(
-            self.in_origin['type'], self.in_origin['url'],
-            {'test_metadata': 'foobar'})
+        self.assertOriginMetadataContains(self.in_origin['url'],
+                                          {'test_metadata': 'foobar'})
 
         with self.assertRaises(AssertionError):
-            self.assertOriginMetadataContains(
-                self.in_origin['type'], self.in_origin['url'],
-                {'test_metadata': 'foobarbaz'})
+            self.assertOriginMetadataContains(self.in_origin['url'],
+                                              {'test_metadata': 'foobarbaz'})
 
         with self.assertRaises(Exception):
-            self.assertOriginMetadataContains(
-                self.in_origin['type'], self.in_origin['url'] + 'blah',
-                {'test_metadata': 'foobar'})
+            self.assertOriginMetadataContains(self.in_origin['url'] + 'blah',
+                                              {'test_metadata': 'foobar'})
 
 
 def test_loader_logger_default_name():