diff --git a/.zuul.yaml b/.zuul.yaml
index a33d28e..3b44abe 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -58,6 +58,7 @@
         - tox-py27
         - tox-py36:
             nodeset: ubuntu-bionic
+        - tox-py38
         - lodgeit-build-opendev-image
     gate:
       jobs:
@@ -65,6 +66,7 @@
         - tox-py27
         - tox-py36:
             nodeset: ubuntu-bionic
+        - tox-py38
         - lodgeit-upload-opendev-image
     promote:
       jobs:
diff --git a/lodgeit/lib/diff.py b/lodgeit/lib/diff.py
index 3c4e033..de24bd3 100644
--- a/lodgeit/lib/diff.py
+++ b/lodgeit/lib/diff.py
@@ -9,7 +9,12 @@
 """
 import re
 import time
-from cgi import escape
+
+try:
+    from html import escape
+except ImportError:
+    from cgi import escape
+
 try:
     all
 except NameError:
diff --git a/tox.ini b/tox.ini
index fa8f58c..744ce4e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = pep8, py27, py36
+envlist = pep8, py27, py36, py38
 skipsdist = True
 
 [testenv]