diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 63fa1e8..46e1ec9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -7,20 +7,26 @@ jobs:
     strategy:
       matrix:
         python:
-        - 3.7
-        - '3.10'
-        - '3.11'
+        - "3.7"
+        - "3.10"
+        - "3.11"
+        # Workaround for actions/setup-python#508
+        dev:
+        - -dev
         platform:
         - ubuntu-latest
         - macos-latest
         - windows-latest
+        include:
+        - python: pypy3.9
+          platform: ubuntu-latest
     runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v3
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: ${{ matrix.python }}-dev
+          python-version: ${{ matrix.python }}${{ matrix.dev }}
       - name: Install tox
         run: |
           python -m pip install tox
@@ -52,7 +58,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.11-dev"
+          python-version: 3.11-dev
       - name: Install tox
         run: |
           python -m pip install tox
diff --git a/docs/conf.py b/docs/conf.py
index 8ae9366..7cd3216 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,10 +1,15 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-extensions = ['sphinx.ext.autodoc', 'jaraco.packaging.sphinx', 'rst.linker']
+extensions = [
+    'sphinx.ext.autodoc',
+    'jaraco.packaging.sphinx',
+]
 
 master_doc = "index"
 
+# Link dates and other references in the changelog
+extensions += ['rst.linker']
 link_files = {
     '../CHANGES.rst': dict(
         using=dict(GH='https://github.com'),
@@ -25,7 +30,7 @@
     )
 }
 
-# Be strict about any broken references:
+# Be strict about any broken references
 nitpicky = True
 
 # Include Python intersphinx mapping to prevent failures
@@ -35,4 +40,7 @@
     'python': ('https://docs.python.org/3', None),
 }
 
+# Preserve authored syntax for defaults
+autodoc_preserve_defaults = True
+
 extensions += ['jaraco.tidelift']
diff --git a/setup.cfg b/setup.cfg
index fd4f3f7..cfe1ec9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -48,7 +48,7 @@ testing =
 
 docs =
 	# upstream
-	sphinx
+	sphinx >= 3.5
 	jaraco.packaging >= 9
 	rst.linker >= 1.9
 	jaraco.tidelift >= 1.4