diff --git a/.editorconfig b/.editorconfig
index 6385b57..b8aeea1 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,6 +9,7 @@ end_of_line = lf
 
 [*.py]
 indent_style = space
+max_line_length = 88
 
 [*.{yml,yaml}]
 indent_style = space
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7d6b455..6aad7f1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,8 +9,11 @@ jobs:
         python:
         - 3.6
         - 3.9
-        - 3.10.0-alpha - 3.10.99
-        platform: [ubuntu-latest, macos-latest, windows-latest]
+        - "3.10"
+        platform:
+        - ubuntu-latest
+        - macos-latest
+        - windows-latest
     runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v2
@@ -34,7 +37,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - name: Install tox
         run: |
           python -m pip install tox
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c15ab0c..f66bf56 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,8 +3,3 @@ repos:
   rev: 20.8b1
   hooks:
   - id: black
-
-- repo: https://github.com/asottile/blacken-docs
-  rev: v1.9.1
-  hooks:
-  - id: blacken-docs
diff --git a/docs/conf.py b/docs/conf.py
index f65d1fa..4ae7409 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -27,3 +27,10 @@
 
 # Be strict about any broken references:
 nitpicky = True
+
+# Include Python intersphinx mapping to prevent failures
+# jaraco/skeleton#51
+extensions += ['sphinx.ext.intersphinx']
+intersphinx_mapping = {
+    'python': ('https://docs.python.org/3', None),
+}
diff --git a/pyproject.toml b/pyproject.toml
index 28bd788..190b355 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=56", "wheel", "setuptools_scm[toml]>=3.4.1"]
+requires = ["setuptools>=56", "setuptools_scm[toml]>=3.4.1"]
 build-backend = "setuptools.build_meta"
 
 [tool.black]
diff --git a/pytest.ini b/pytest.ini
index f9d9379..c0a643e 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -3,8 +3,6 @@ norecursedirs=dist build .tox .eggs
 # doctests disabled due to pytest-dev/pytest#3396
 # addopts=--doctest-modules
 doctest_optionflags=ALLOW_UNICODE ELLIPSIS
-# workaround for warning pytest-dev/pytest#6178
-junit_family=xunit2
 filterwarnings=
 	# Suppress deprecation warning in flake8
 	ignore:SelectableGroups dict interface is deprecated::flake8
diff --git a/setup.cfg b/setup.cfg
index 4fb8d0a..415f32a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -29,7 +29,7 @@ exclude =
 [options.extras_require]
 testing =
 	# upstream
-	pytest >= 4.6
+	pytest >= 6
 	pytest-checkdocs >= 2.4
 	pytest-flake8
 	pytest-black >= 0.3.7; \