diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml
index 054b63f4..b89a1c0d 100644
--- a/.github/workflows/python_ci.yml
+++ b/.github/workflows/python_ci.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: "windows-2019"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.5,pypy-3.6,pypy-3.7'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.5'
 
     strategy:
       fail-fast: False
@@ -24,8 +24,6 @@ jobs:
           - {python-version: "3.8", testenvs: "py38,build", experimental: False}
           - {python-version: "3.9", testenvs: "py39,build", experimental: False}
           - {python-version: "3.10.0-alpha.5", testenvs: "py310-dev,build", experimental: True}
-          - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
-          - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False}
 
     steps:
       - name: Checkout 🛎️
diff --git a/__pkginfo__.py b/__pkginfo__.py
index c97b0abc..d65b3f4c 100644
--- a/__pkginfo__.py
+++ b/__pkginfo__.py
@@ -27,7 +27,6 @@
 """
 
 __version__ = "2021.2.18"
-
 repo_root = pathlib.Path(__file__).parent
 install_requires = (repo_root / "requirements.txt").read_text(encoding="utf-8").split('\n')
 extras_require = {
diff --git a/tox.ini b/tox.ini
index a95139b3..618901d8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -49,11 +49,11 @@ commands = sphinx-build -M html . ./build {posargs}
 skip_install = True
 changedir = {toxinidir}
 deps =
-    twine>=3.2.0
-    pep517>=0.9.1
+    build>=0.3.0
     check-wheel-contents>=0.1.0
+    twine>=3.2.0
 commands =
-    python -m pep517.build --source --binary "{toxinidir}"
+    python -m build --sdist --wheel "{toxinidir}"
     twine check dist/*.tar.gz dist/*.whl
     check-wheel-contents dist/