diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 44eef5aa..82fdd259 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "pypy-3.8"]
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
index 5bdf49bd..f56241ef 100755
--- a/scripts/run_tests.sh
+++ b/scripts/run_tests.sh
@@ -23,10 +23,10 @@ case "${MODE}" in
     tox -e docs
     ;;
   format)
-    black --target-version=py36 bleach/*.py tests/ tests_website/
+    black --target-version=py37 bleach/*.py tests/ tests_website/
     ;;
   format-check)
-    black --target-version=py36 --check --diff bleach/*.py tests/ tests_website/
+    black --target-version=py37 --check --diff bleach/*.py tests/ tests_website/
     ;;
   check-reqs)
     mv requirements-dev.txt requirements-dev.txt.orig
diff --git a/setup.cfg b/setup.cfg
index 7875aeb5..d7bdc09e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,6 +14,3 @@ max-line-length = 100
 
 [tool:pytest]
 addopts = -W error:html5lib:DeprecationWarning
-
-[wheel]
-universal=1
diff --git a/setup.py b/setup.py
index 4d0638cd..b139d4dc 100755
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ def get_version():
     include_package_data=True,
     package_data={'': ['README.rst']},
     zip_safe=False,
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     install_requires=install_requires,
     classifiers=[
         'Development Status :: 5 - Production/Stable',
@@ -55,7 +55,7 @@ def get_version():
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
diff --git a/tox.ini b/tox.ini
index f53aee2c..98b6dfac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,8 +2,8 @@
 
 [tox]
 envlist =
-    py{36,37,38,39,310,py3}
-    py{36,37,38,39,310}-build-no-lang
+    py{37,38,39,310,py3}
+    py{37,38,39,310}-build-no-lang
     docs
     format-check
     lint
@@ -16,12 +16,6 @@ commands =
     pytest {posargs:-v}
     python setup.py build
 
-[testenv:py36-build-no-lang]
-setenv =
-    LANG=
-commands =
-    python setup.py build
-
 [testenv:py37-build-no-lang]
 setenv =
     LANG=