diff --git a/queue_job/tests/common.py b/queue_job/tests/common.py
index ca88c31b4..53dbef045 100644
--- a/queue_job/tests/common.py
+++ b/queue_job/tests/common.py
@@ -1,16 +1,11 @@
 # Copyright 2019 Camptocamp
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-import doctest
-import logging
 import typing
 from contextlib import contextmanager
 from itertools import groupby
 from operator import attrgetter
 from unittest import TestCase, mock
 
-from odoo.tests.case import TestCase as _TestCase
-from odoo.tests.common import MetaCase
-
 from odoo.addons.queue_job.delay import Graph
 
 # pylint: disable=odoo-addons-relative-import
@@ -411,51 +406,3 @@ def test_export(self):
         delayable = mock.MagicMock(name="DelayableBinding")
         delayable_cls.return_value = delayable
         yield delayable_cls, delayable
-
-
-class OdooDocTestCase(doctest.DocTestCase, _TestCase, MetaCase("DummyCase", (), {})):
-    """
-    We need a custom DocTestCase class in order to:
-    - define test_tags to run as part of standard tests
-    - output a more meaningful test name than default "DocTestCase.runTest"
-    """
-
-    def __init__(
-        self, doctest, optionflags=0, setUp=None, tearDown=None, checker=None, seq=0
-    ):
-        super().__init__(
-            doctest._dt_test,
-            optionflags=optionflags,
-            setUp=setUp,
-            tearDown=tearDown,
-            checker=checker,
-        )
-        self.test_sequence = seq
-
-    def setUp(self):
-        """Log an extra statement which test is started."""
-        super().setUp()
-        logging.getLogger(__name__).info("Running tests for %s", self._dt_test.name)
-
-
-def load_doctests(module):
-    """
-    Generates a tests loading method for the doctests of the given module
-    https://docs.python.org/3/library/unittest.html#load-tests-protocol
-    """
-
-    def load_tests(loader, tests, ignore):
-        """
-        Apply the 'test_tags' attribute to each DocTestCase found by the DocTestSuite.
-        Also extend the DocTestCase class trivially to fit the class teardown
-        that Odoo backported for its own test classes from Python 3.8.
-        """
-
-        for idx, test in enumerate(doctest.DocTestSuite(module)):
-            odoo_test = OdooDocTestCase(test, seq=idx)
-            odoo_test.test_tags = {"standard", "at_install", "queue_job", "doctest"}
-            tests.addTest(odoo_test)
-
-        return tests
-
-    return load_tests
diff --git a/queue_job/tests/test_runner_channels.py b/queue_job/tests/test_runner_channels.py
index d323d0068..e7124abce 100644
--- a/queue_job/tests/test_runner_channels.py
+++ b/queue_job/tests/test_runner_channels.py
@@ -1,10 +1,15 @@
 # Copyright 2015-2016 Camptocamp SA
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)
+import doctest
+
+from odoo.tests import BaseCase, tagged
 
 # pylint: disable=odoo-addons-relative-import
 # we are testing, we want to test as we were an external consumer of the API
 from odoo.addons.queue_job.jobrunner import channels
 
-from .common import load_doctests
 
-load_tests = load_doctests(channels)
+@tagged("doctest")
+class TestDoctest(BaseCase):
+    def test_doctest(self):
+        doctest.testmod(channels, exclude_empty=True, raise_on_error=True)
diff --git a/queue_job/tests/test_runner_runner.py b/queue_job/tests/test_runner_runner.py
index 131ce6322..6ff543c98 100644
--- a/queue_job/tests/test_runner_runner.py
+++ b/queue_job/tests/test_runner_runner.py
@@ -1,17 +1,19 @@
 # Copyright 2015-2016 Camptocamp SA
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)
-
-# pylint: disable=odoo-addons-relative-import
-# we are testing, we want to test as we were an external consumer of the API
+import doctest
 import os
 
 from odoo.tests import BaseCase, tagged
 
+# pylint: disable=odoo-addons-relative-import
+# we are testing, we want to test as we were an external consumer of the API
 from odoo.addons.queue_job.jobrunner import runner
 
-from .common import load_doctests
 
-load_tests = load_doctests(runner)
+@tagged("doctest")
+class TestDoctest(BaseCase):
+    def test_doctest(self):
+        doctest.testmod(runner, exclude_empty=True, raise_on_error=True)
 
 
 @tagged("-at_install", "post_install")