diff --git a/.travis.yml b/.travis.yml
index 60eafa3..213b44f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,23 @@
 language: python
 python:
-  - "3.7"
+  - "3.8"
 env:
-  - WAGTAIL="wagtail>=2.6,<2.7" DB=sqlite
+  - WAGTAIL="wagtail>=2.7,<2.8" DB=sqlite
 matrix:
   include:
   # Latest Wagtail version
-  - env: WAGTAIL="wagtail>=2.6,<2.7" DB=postgres
-  - env: WAGTAIL="wagtail>=2.6,<2.7" DB=mysql
+  - env: WAGTAIL="wagtail>=2.7,<2.8" DB=postgres
+  - env: WAGTAIL="wagtail>=2.7,<2.8" DB=mysql
+  - python: "3.8"
   - python: "3.7"
   - python: "3.6"
   - python: "3.5"
-  - python: "3.4"
   # Past Wagtail versions
   - python: "3.7"
+    env: WAGTAIL="wagtail>=2.6,<2.7"
+  - python: "3.7"
+    env: WAGTAIL="wagtail>=2.5,<2.6"
+  - python: "3.4" # Wagtail 2.5 was the last to support python 3.4
     env: WAGTAIL="wagtail>=2.5,<2.6"
   - python: "3.7"
     env: WAGTAIL="wagtail>=2.4,<2.5"
@@ -44,7 +48,7 @@ before_script:
 install:
   - pip install --upgrade -q pip setuptools
   - if [[ $DB == mysql ]] && [[ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]]; then pip install -q mysql-python; elif [[ $DB == mysql ]] && [[ ${TRAVIS_PYTHON_VERSION:0:1} == "3" ]]; then pip install -q mysqlclient; fi
-  - if [[ $DB == postgres ]]; then pip install -q 'psycopg2-binary<2.8'; fi
+  - if [[ $DB == postgres ]]; then pip install -q 'psycopg2-binary'; fi
   - pip install $WAGTAIL
   - pip install -e .
 script:
diff --git a/tox.ini b/tox.ini
index fdc8d81..8a5762e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,13 @@
 [tox]
 envlist =
+    py38-2.7.X,
+    py37-2.7.X,
+    py36-2.7.X,
+    py35-2.7.X,
+    py34-2.7.X,
     py37-2.6.X,
     py36-2.6.X,
     py35-2.6.X,
-    py34-2.6.X,
     py37-2.5.X,
     py36-2.5.X,
     py35-2.5.X,
@@ -37,6 +41,26 @@ envlist =
 commands =
     {envpython} runtests.py
 
+[testenv:py38-2.7.X]
+basepython = python3.8
+deps =
+    wagtail>=2.7,<2.8
+
+[testenv:py37-2.7.X]
+basepython = python3.7
+deps =
+    wagtail>=2.7,<2.8
+
+[testenv:py36-2.7.X]
+basepython = python3.6
+deps =
+    wagtail>=2.7,<2.8
+
+[testenv:py35-2.7.X]
+basepython = python3.5
+deps =
+    wagtail>=2.7,<2.8
+
 [testenv:py37-2.6.X]
 basepython = python3.7
 deps =
@@ -52,11 +76,6 @@ basepython = python3.5
 deps =
     wagtail>=2.6,<2.7
 
-[testenv:py34-2.6.X]
-basepython = python3.4
-deps =
-    wagtail>=2.6,<2.7
-
 [testenv:py37-2.5.X]
 basepython = python3.7
 deps =