diff --git a/setup.py b/setup.py
index 8a0b8ad4..71c2338e 100644
--- a/setup.py
+++ b/setup.py
@@ -40,6 +40,9 @@ setup(
         "Programming Language :: Python :: 3.5",
         "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",
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         "Topic :: Software Development :: Libraries :: Application Frameworks",
diff --git a/tox.ini b/tox.ini
index 63dda527..e111ad9a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
-    py{37,36,35,27,py3,py}
-    py37-{simplejson,devel,lowest}
+    py{38,37,36,35,27,py3,py}
+    py38-{simplejson,devel,lowest}
     docs-html
     coverage