diff --git a/swh/lister/bitbucket/tests/conftest.py b/swh/lister/bitbucket/tests/conftest.py
new file mode 100644
index 0000000..9408bfd
--- /dev/null
+++ b/swh/lister/bitbucket/tests/conftest.py
@@ -0,0 +1,32 @@
+# 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 pytest
+
+
+@pytest.fixture
+def lister_under_test():
+    return "bitbucket"
+
+
+@pytest.fixture
+def lister_bitbucket(swh_lister):
+    for task_type in [
+        {
+            "type": "load-git",
+            "description": "Load git repository",
+            "backend_name": "swh.loader.git.tasks.UpdateGitRepository",
+            "default_interval": "1 day",
+        },
+        {
+            "type": "load-hg",
+            "description": "Load hg repository",
+            "backend_name": "swh.loader.mercurial.tasks.LoadMercurial",
+            "default_interval": "1 day",
+        },
+    ]:
+        swh_lister.scheduler.create_task_type(task_type)
+
+    return swh_lister
diff --git a/swh/lister/bitbucket/tests/test_lister.py b/swh/lister/bitbucket/tests/test_lister.py
index 355103d..319c03b 100644
--- a/swh/lister/bitbucket/tests/test_lister.py
+++ b/swh/lister/bitbucket/tests/test_lister.py
@@ -1,125 +1,117 @@
 # Copyright (C) 2017-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
 
 from datetime import timedelta
 import re
 import unittest
 from urllib.parse import unquote
 
 import iso8601
-import pytest
 import requests_mock
 
 from swh.lister.bitbucket.lister import BitBucketLister
 from swh.lister.core.tests.test_lister import HttpListerTester
 
 
-@pytest.fixture
-def lister_under_test():
-    return "bitbucket"
-
-
 def _convert_type(req_index):
     """Convert the req_index to its right type according to the model's
        "indexable" column.
 
     """
     return iso8601.parse_date(unquote(req_index))
 
 
 class BitBucketListerTester(HttpListerTester, unittest.TestCase):
     Lister = BitBucketLister
     test_re = re.compile(r"/repositories\?after=([^?&]+)")
     lister_subdir = "bitbucket"
     good_api_response_file = "data/https_api.bitbucket.org/response.json"
     bad_api_response_file = "data/https_api.bitbucket.org/empty_response.json"
     first_index = _convert_type("2008-07-12T07:44:01.476818+00:00")
     last_index = _convert_type("2008-07-19T06:16:43.044743+00:00")
     entries_per_page = 10
     convert_type = _convert_type
 
     def request_index(self, request):
         """(Override) This is needed to emulate the listing bootstrap
         when no min_bound is provided to run
         """
         m = self.test_re.search(request.path_url)
         idx = _convert_type(m.group(1))
         if idx == self.Lister.default_min_bound:
             idx = self.first_index
         return idx
 
     @requests_mock.Mocker()
     def test_fetch_none_nodb(self, http_mocker):
         """Overridden because index is not an integer nor a string
 
         """
         http_mocker.get(self.test_re, text=self.mock_response)
         fl = self.get_fl()
 
         self.disable_scheduler(fl)
         self.disable_db(fl)
 
         # stores no results
         fl.run(
             min_bound=self.first_index - timedelta(days=3), max_bound=self.first_index
         )
 
     def test_is_within_bounds(self):
         fl = self.get_fl()
         self.assertTrue(
             fl.is_within_bounds(
                 iso8601.parse_date("2008-07-15"), self.first_index, self.last_index
             )
         )
         self.assertFalse(
             fl.is_within_bounds(
                 iso8601.parse_date("2008-07-20"), self.first_index, self.last_index
             )
         )
         self.assertFalse(
             fl.is_within_bounds(
                 iso8601.parse_date("2008-07-11"), self.first_index, self.last_index
             )
         )
 
 
-def test_lister_bitbucket(swh_lister, requests_mock_datadir):
+def test_lister_bitbucket(lister_bitbucket, requests_mock_datadir):
     """Simple bitbucket listing should create scheduled tasks (git, hg)
 
     """
-    lister = swh_lister
-
-    lister.run()
+    lister_bitbucket.run()
 
-    r = lister.scheduler.search_tasks(task_type="load-hg")
+    r = lister_bitbucket.scheduler.search_tasks(task_type="load-hg")
     assert len(r) == 9
 
     for row in r:
         args = row["arguments"]["args"]
         kwargs = row["arguments"]["kwargs"]
 
         assert len(args) == 0
         assert len(kwargs) == 1
         url = kwargs["url"]
 
         assert url.startswith("https://bitbucket.org")
 
         assert row["policy"] == "recurring"
         assert row["priority"] is None
 
-    r = lister.scheduler.search_tasks(task_type="load-git")
+    r = lister_bitbucket.scheduler.search_tasks(task_type="load-git")
     assert len(r) == 1
 
     for row in r:
         args = row["arguments"]["args"]
         kwargs = row["arguments"]["kwargs"]
         assert len(args) == 0
         assert len(kwargs) == 1
         url = kwargs["url"]
 
         assert url.startswith("https://bitbucket.org")
 
         assert row["policy"] == "recurring"
         assert row["priority"] is None