diff --git a/HISTORY.rst b/HISTORY.rst
index 3358dd3f76..6fefa17fbe 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -21,6 +21,8 @@ test-driven methodologies, and modern toolchains for unrivaled success.
 6.1.16 (2024-??-??)
 ~~~~~~~~~~~~~~~~~~~
 
+* Corrected an issue where the incorrect public class was imported for the ``DoctestTestRunner`` (`issue #4949 <https://github.com/platformio/platformio-core/issues/4949>`_)
+
 6.1.15 (2024-04-25)
 ~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs b/docs
index 988666b05e..7159a21142 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 988666b05e7e83e4f5672a58897cd3a355afd9c6
+Subproject commit 7159a21142ef05f0ddb1c1065c8ccfaa1657e399
diff --git a/platformio/public.py b/platformio/public.py
index 49db1b544e..d3afa020cf 100644
--- a/platformio/public.py
+++ b/platformio/public.py
@@ -23,7 +23,7 @@
 from platformio.project.options import get_config_options_schema
 from platformio.test.result import TestCase, TestCaseSource, TestStatus
 from platformio.test.runners.base import TestRunnerBase
-from platformio.test.runners.doctest import DoctestTestCaseParser
+from platformio.test.runners.doctest import DoctestTestRunner
 from platformio.test.runners.googletest import GoogletestTestRunner
 from platformio.test.runners.unity import UnityTestRunner
 from platformio.util import get_systype