diff --git a/.circleci/config.yml b/.circleci/config.yml
index 46af6c8c..8706ea2f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -76,6 +76,12 @@ jobs:
       - image: cimg/python:3.10
         environment:
           TOXENV: py310-core
+  py311-core:
+    <<: *common
+    docker:
+      - image: cimg/python:3.11
+        environment:
+          TOXENV: py311-core
   py37-pyevm:
     <<: *common
     docker:
@@ -100,6 +106,12 @@ jobs:
       - image: cimg/python:3.10
         environment:
           TOXENV: py310-pyevm
+  py311-pyevm:
+    <<: *common
+    docker:
+      - image: cimg/python:3.11
+        environment:
+          TOXENV: py311-pyevm
 
 workflows:
   version: 2
@@ -110,8 +122,10 @@ workflows:
       - py38-core
       - py39-core
       - py310-core
+      - py311-core
       - py37-pyevm
       - py38-pyevm
       - py39-pyevm
       - py310-pyevm
+      - py311-pyevm
       - docs
diff --git a/setup.py b/setup.py
index ca98db1f..6e06378c 100644
--- a/setup.py
+++ b/setup.py
@@ -82,5 +82,6 @@
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
     ],
 )
diff --git a/tox.ini b/tox.ini
index 9b95f7cf..4fb2b41b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist=
-    py{37,38,39,310}-{core,pyevm}
+    py{37,38,39,310,311}-{core,pyevm}
     lint
     docs
 
@@ -10,7 +10,7 @@ exclude= tests/*
 
 [testenv]
 usedevelop=True
-whitelist_externals=
+allowlist_externals=
     /usr/bin/make
 commands=
     core: pytest {posargs:tests/core}
@@ -23,6 +23,7 @@ basepython =
     py38: python3.8
     py39: python3.9
     py310: python3.10
+    py311: python3.11
     docs: python3.9
 extras =
     test