diff --git a/conftest.py b/conftest.py
index eb6de3d..54da8ee 100644
--- a/conftest.py
+++ b/conftest.py
@@ -1,6 +1,15 @@
+# Copyright (C) 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 hypothesis import settings
 
 # define tests profile. Full documentation is at:
 # https://hypothesis.readthedocs.io/en/latest/settings.html#settings-profiles
 settings.register_profile("fast", max_examples=5, deadline=5000)
 settings.register_profile("slow", max_examples=20, deadline=5000)
+
+
+pytest_plugins = ["swh.scheduler.pytest_plugin"]
diff --git a/setup.py b/setup.py
index 2406698..fe21851 100755
--- a/setup.py
+++ b/setup.py
@@ -1,74 +1,72 @@
 #!/usr/bin/env python3
 # Copyright (C) 2015-2019  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 setuptools import setup, find_packages
 
 from os import path
 from io import open
 
 here = path.abspath(path.dirname(__file__))
 
 # Get the long description from the README file
 with open(path.join(here, "README.md"), encoding="utf-8") as f:
     long_description = f.read()
 
 
 def parse_requirements(name=None):
     if name:
         reqf = "requirements-%s.txt" % name
     else:
         reqf = "requirements.txt"
 
     requirements = []
     if not path.exists(reqf):
         return requirements
 
     with open(reqf) as f:
         for line in f.readlines():
             line = line.strip()
             if not line or line.startswith("#"):
                 continue
             requirements.append(line)
     return requirements
 
 
 setup(
     name="swh.scheduler",
     description="Software Heritage Scheduler",
     long_description=long_description,
     long_description_content_type="text/markdown",
     python_requires=">=3.7",
     author="Software Heritage developers",
     author_email="swh-devel@inria.fr",
     url="https://forge.softwareheritage.org/diffusion/DSCH/",
     packages=find_packages(),
     setup_requires=["setuptools-scm"],
     use_scm_version=True,
     install_requires=parse_requirements() + parse_requirements("swh"),
     extras_require={"testing": parse_requirements("test")},
     include_package_data=True,
     entry_points="""
         [console_scripts]
         swh-scheduler=swh.scheduler.cli:main
         [swh.cli.subcommands]
         scheduler=swh.scheduler.cli:cli
-        [pytest11]
-        pytest_swh_scheduler=swh.scheduler.pytest_plugin
     """,
     classifiers=[
         "Programming Language :: Python :: 3",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
         "Operating System :: OS Independent",
         "Development Status :: 5 - Production/Stable",
     ],
     project_urls={
         "Bug Reports": "https://forge.softwareheritage.org/maniphest",
         "Funding": "https://www.softwareheritage.org/donate",
         "Source": "https://forge.softwareheritage.org/source/swh-scheduler",
         "Documentation": "https://docs.softwareheritage.org/devel/swh-scheduler/",
     },
 )
diff --git a/swh/scheduler/tests/conftest.py b/swh/scheduler/tests/conftest.py
index 380692c..d187c42 100644
--- a/swh/scheduler/tests/conftest.py
+++ b/swh/scheduler/tests/conftest.py
@@ -1,46 +1,42 @@
-# Copyright (C) 2016-2019  The Software Heritage developers
+# Copyright (C) 2016-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
 from datetime import datetime, timezone
 from typing import List
 
 import pytest
 
 from swh.scheduler.model import ListedOrigin, Lister
 from swh.scheduler.tests.common import LISTERS
 
-from swh.scheduler.pytest_plugin import (  # noqa: F401 (backwards-compat imports)
-    swh_scheduler_celery_app as swh_app,
-    swh_scheduler_celery_worker as celery_session_worker,
-)
 
 # make sure we are not fooled by CELERY_ config environment vars
 for var in [x for x in os.environ.keys() if x.startswith("CELERY")]:
     os.environ.pop(var)
 
 
 # test_cli tests depends on a en/C locale, so ensure it
 os.environ["LC_ALL"] = "C.UTF-8"
 
 
 @pytest.fixture
 def stored_lister(swh_scheduler) -> Lister:
     """Store a lister in the scheduler and return its information"""
     return swh_scheduler.get_or_create_lister(**LISTERS[0])
 
 
 @pytest.fixture
 def listed_origins(stored_lister) -> List[ListedOrigin]:
     """Return a (fixed) set of 1000 listed origins"""
     return [
         ListedOrigin(
             lister_id=stored_lister.id,
             url=f"https://example.com/{i:04d}.git",
             visit_type="git",
             last_update=datetime(2020, 6, 15, 16, 0, 0, i, tzinfo=timezone.utc),
         )
         for i in range(1000)
     ]