diff --git a/.travis.yml b/.travis.yml
index 39e0bbf..f8ff7f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,9 @@
 
 matrix:
   include:
+    - python: 3.8
+      dist: xenial
+      sudo: true
     - python: 3.7
       dist: xenial
       sudo: true
@@ -11,6 +14,9 @@
     - python: 3.5
     - python: 2.7
     - python: pypy
+    - os: osx
+      language: generic
+      env: CONDA=3.8 TOXENV=py38
     - os: osx
       language: generic
       env: CONDA=3.7 TOXENV=py37
@@ -63,4 +69,4 @@
   on:
     tags: true
     repo: DiamondLightSource/python-procrunner
-    python: 3.7
+    python: 3.8
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 59169e6..341c9e7 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -102,7 +102,7 @@
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 2.7, 3.5, 3.6, 3.7, and for PyPy. Check
+3. The pull request should work for Python 2.7, 3.5, 3.6, 3.7, 3.8, and for PyPy. Check
    https://travis-ci.org/DiamondLightSource/python-procrunner/pull_requests
    and make sure that the tests pass for all supported Python versions.
 
diff --git a/appveyor.yml b/appveyor.yml
index 4062d10..e6e1890 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,12 +12,16 @@
       UNSTABLE: 1
     - PYTHON: "C:\\Python37"
       UNSTABLE: 1
+    - PYTHON: "C:\\Python38"
+      UNSTABLE: 1
     - PYTHON: "C:\\Python27-x64"
     - PYTHON: "C:\\Python35-x64"
       UNSTABLE: 1
     - PYTHON: "C:\\Python36-x64"
       UNSTABLE: 1
     - PYTHON: "C:\\Python37-x64"
+      UNSTABLE: 1
+    - PYTHON: "C:\\Python38-x64"
       UNSTABLE: 1
 
 matrix:
diff --git a/setup.py b/setup.py
index 92849ed..ec54275 100644
--- a/setup.py
+++ b/setup.py
@@ -37,6 +37,7 @@
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: Software Development :: Libraries :: Python Modules",