diff --git a/.editorconfig b/.editorconfig
index 6385b57343..b8aeea177b 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 b348056b7d..a82b6fd299 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,8 +10,11 @@ jobs:
         - pypy3
         - 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
@@ -42,7 +45,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/docs/conf.py b/docs/conf.py
index 8f1e1f4c6d..ba541423f1 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -76,17 +76,24 @@
 # Be strict about any broken references:
 nitpicky = True
 
+# Include Python intersphinx mapping to prevent failures
+# jaraco/skeleton#51
+extensions += ['sphinx.ext.intersphinx']
 intersphinx_mapping = {
-    'pypa-build': ('https://pypa-build.readthedocs.io/en/latest/', None)
+    'python': ('https://docs.python.org/3', None),
 }
 
+intersphinx_mapping.update({
+    'pypa-build': ('https://pypa-build.readthedocs.io/en/latest/', None)
+})
+
 # Add support for linking usernames
 github_url = 'https://github.com'
 github_sponsors_url = f'{github_url}/sponsors'
 extlinks = {
     'user': (f'{github_sponsors_url}/%s', '@'),  # noqa: WPS323
 }
-extensions += ['sphinx.ext.extlinks', 'sphinx.ext.intersphinx']
+extensions += ['sphinx.ext.extlinks']
 
 # Ref: https://github.com/python-attrs/attrs/pull/571/files\
 #      #diff-85987f48f1258d9ee486e3191495582dR82
diff --git a/pyproject.toml b/pyproject.toml
index 70e3473d44..03c40125c9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,5 @@
 [build-system]
-requires = [
-    "wheel",
-]
+requires = []
 build-backend = "setuptools.build_meta"
 backend-path = ["."]
 
diff --git a/pytest.ini b/pytest.ini
index c7b62cc657..bdcab1bffb 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -5,8 +5,6 @@ addopts=
 	--doctest-glob=pkg_resources/api_tests.txt
 	-r sxX
 doctest_optionflags=ALLOW_UNICODE ELLIPSIS
-# workaround for warning pytest-dev/pytest#6178
-junit_family=xunit2
 filterwarnings=
 	# Fail on warnings
 	error
diff --git a/setup.cfg b/setup.cfg
index 65c9479c13..885ee07efe 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -39,7 +39,7 @@ exclude =
 [options.extras_require]
 testing =
 	# upstream
-	pytest >= 4.6
+	pytest >= 6
 	pytest-checkdocs >= 2.4
 	pytest-flake8
 	pytest-black >= 0.3.7; \