diff --git a/.github/workflows/test_suite.yml b/.github/workflows/test_suite.yml
index bef1b10..c77cb1e 100644
--- a/.github/workflows/test_suite.yml
+++ b/.github/workflows/test_suite.yml
@@ -38,7 +38,7 @@ jobs:
     strategy:
       matrix:
         browser: [chrome, firefox]
-        python-version: [pypy3, 3.6, 3.7, 3.8]
+        python-version: [3.8, 3.9]
 
     steps:
       - name: Pull selenium-standalone:latest
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 623a48f..f75463d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,13 +1,13 @@
 repos:
   - repo: https://github.com/asottile/reorder_python_imports
-    rev: v2.7.1
+    rev: v3.0.1
     hooks:
       - id: reorder-python-imports
         language_version: python3
         args:
           - --application-directories=.:src
   - repo: https://github.com/psf/black
-    rev: 22.1.0
+    rev: 22.3.0
     hooks:
       - id: black
         args: [--safe, --quiet, --line-length, "100"]
@@ -31,12 +31,12 @@ repos:
       - id: debug-statements
         language_version: python3
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.31.0
+    rev: v2.31.1
     hooks:
       - id: pyupgrade
         language_version: python3
-        args: [--py36-plus]
+        args: [--py3-plus, --py38-plus]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.931
+    rev: v0.942
     hooks:
       - id: mypy
diff --git a/setup.cfg b/setup.cfg
index ad6328e..fd9f636 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,15 +5,13 @@ author_email = mfalesni@redhat.com
 maintainer = Pete Savage
 maintainer_email = psavage@redhat.com
 description = Making testing of UIs fantastic
-long_description= file: README.rst
+long_description = file: README.rst
 license = Apache license
 url = https://github.com/RedHatQE/widgetastic.core
 classifiers =
     License :: OSI Approved :: Apache Software License
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: Implementation :: PyPy
@@ -22,6 +20,7 @@ classifiers =
     Topic :: Software Development :: Testing
 
 [options]
+python_requires = >= 3.8
 install_requires =
     anytree
     cached_property