diff --git a/.github/workflows/s390x.yml b/.github/workflows/s390x.yml
index c28e403b2..0030fddca 100644
--- a/.github/workflows/s390x.yml
+++ b/.github/workflows/s390x.yml
@@ -69,7 +69,7 @@ jobs:
           run: |
             python3 -m venv --system-site-packages tests
             source tests/bin/activate
-            pip3 install --upgrade pip setuptools pytest pytest-doctestplus pytest-remotedata
+            pip3 install --upgrade pip setuptools pytest pytest-remotedata
             pip3 install -e .[all,tests]
             pip3 list
             python3 -m pytest --remote-data
diff --git a/asdf/util.py b/asdf/util.py
index bca67ea3c..769f5ef27 100644
--- a/asdf/util.py
+++ b/asdf/util.py
@@ -471,7 +471,7 @@ class _InheritDocstrings(type):
         ...     def wiggle(self):
         ...         pass
         >>> B.wiggle.__doc__
-        u'Wiggle the thingamajig'
+        'Wiggle the thingamajig'
     """
 
     def __init__(cls, name, bases, dct):
diff --git a/docs/conftest.py b/docs/conftest.py
new file mode 100644
index 000000000..1a62e1b5d
--- /dev/null
+++ b/docs/conftest.py
@@ -0,0 +1 @@
+collect_ignore = ["conf.py"]
diff --git a/pyproject.toml b/pyproject.toml
index 4451f2556..582029927 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -47,7 +47,6 @@ tests = [
   "lz4>=0.10",
   "psutil",
   "pytest>=7",
-  "pytest-doctestplus",
   "pytest-remotedata",
 ]
 [project.urls]
@@ -101,18 +100,15 @@ force-exclude = '''
 [tool.pytest.ini_options]
 testpaths = ['asdf', 'docs']
 minversion = 4.6
-norecursedirs = ['build', 'docs/_build', 'docs/sphinxext']
-doctest_plus = 'enabled'
 remote_data_strict = true
 filterwarnings = [
     'error',
     'ignore:numpy.ndarray size changed:RuntimeWarning',
 ]
-# Configuration for pytest-doctestplus
-text_file_format = 'rst'
 addopts = [
+    '--doctest-modules',
+    '--doctest-glob=*.rst',
     '--color=yes',
-    '--doctest-rst',
     '-rsxfE',
     '-p no:legacypath',
 ]
diff --git a/tox.ini b/tox.ini
index 49eb172fa..68e0c6ae2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,8 +25,6 @@ deps =
     oldestdeps: minimum_dependencies
     parallel: pytest-xdist
     pytestdev: git+https://github.com/pytest-dev/pytest
-# released versions of doctestplus aren't compatible with pytest-dev
-    pytestdev: git+https://github.com/scientific-python/pytest-doctestplus
 extras = all,tests
 # astropy will complain if the home directory is missing
 pass_env = HOME