diff --git a/.appveyor.yml b/.appveyor.yml
index 3a032f75..92f34f15 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -10,6 +10,10 @@ environment:
     - TOXENV: py35-optional
     - TOXENV: py36-base
     - TOXENV: py36-optional
+    - TOXENV: py37-base
+    - TOXENV: py37-optional
+    - TOXENV: py38-base
+    - TOXENV: py38-optional
 
 install:
   - git submodule update --init --recursive
diff --git a/.travis.yml b/.travis.yml
index 7536b8db..c944f922 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: python
 python:
   - "pypy3"
   - "pypy"
+  - "3.8"
   - "3.7"
   - "3.6"
   - "3.5"
diff --git a/setup.py b/setup.py
index 27c97727..d3841290 100644
--- a/setup.py
+++ b/setup.py
@@ -68,6 +68,10 @@ def default_environment():
     'Programming Language :: Python :: 3',
     '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 :: Software Development :: Libraries :: Python Modules',
     'Topic :: Text Processing :: Markup :: HTML'
 ]
diff --git a/tox.ini b/tox.ini
index edb752f6..58758cea 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py27,py35,py36,pypy}-{base,six19,optional}
+envlist = py{27,35,36,37,38,py,py3}-{base,six19,optional}
 
 [testenv]
 deps =