diff --git a/.circleci/config.yml b/.circleci/config.yml
index fa7691e6..0027cef1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -60,6 +60,12 @@ jobs:
       - image: circleci/python:3.7
         environment:
           TOXENV: py37-core
+  py38-core:
+    <<: *common
+    docker:
+      - image: circleci/python:3.8
+        environment:
+          TOXENV: py38-core
   pypy3-core:
     <<: *common
     docker:
diff --git a/setup.py b/setup.py
index 2b8c7201..65d7904a 100644
--- a/setup.py
+++ b/setup.py
@@ -75,6 +75,7 @@ setup(
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: Implementation :: PyPy',
     ],
 )
diff --git a/tox.ini b/tox.ini
index 07b2179c..33b16f2b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist=
-    py{36,37,py3}-core
+    py{36,37,38,py3}-core
     lint
     docs
 
@@ -28,6 +28,7 @@ basepython =
     docs: python
     py36: python3.6
     py37: python3.7
+    py37: python3.8
     pypy3: pypy3
 extras=
     test