diff --git a/.travis.yml b/.travis.yml
index f131f7eb3..0cc1790dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,10 @@ matrix:
       os: linux
       env: CONTAINER=ubuntu1804
       services: docker
+    - name: "Ubuntu 20.04"
+      os: linux
+      env: CONTAINER=ubuntu2004
+      services: docker
     - name: "OpenSUSE 15.0"
       os: linux
       env: CONTAINER=opensuse1500
diff --git a/docker-compose.yml b/docker-compose.yml
index 3ddc1f830..1fc4e8d61 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,14 +24,6 @@ services:
     security_opt:
       - label=type:container_runtime_t
     tty: true
-  test-ubuntu1604:
-    build:
-        context: .
-        dockerfile: test/docker/ubuntu1604
-    network_mode: "host"
-    security_opt:
-      - label=type:container_runtime_t
-    tty: true
   test-ubuntu1804:
     build:
         context: .
@@ -40,6 +32,14 @@ services:
     security_opt:
       - label=type:container_runtime_t
     tty: true
+  test-ubuntu2004:
+    build:
+        context: .
+        dockerfile: test/docker/ubuntu2004
+    network_mode: "host"
+    security_opt:
+      - label=type:container_runtime_t
+    tty: true
   test-debianstable:
     build:
         context: .
diff --git a/test/docker/ubuntu2004 b/test/docker/ubuntu2004
new file mode 100644
index 000000000..5beafcc37
--- /dev/null
+++ b/test/docker/ubuntu2004
@@ -0,0 +1,27 @@
+FROM ubuntu:20.04
+
+RUN apt-get update
+RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y build-essential cmake git uuid-dev libgnutls28-dev faketime locales python3
+
+# Setup language environment
+RUN locale-gen en_US.UTF-8
+ENV LC_ALL en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US.UTF-8
+
+# Setup taskwarrior
+ADD . /root/code/
+WORKDIR /root/code/
+RUN git clean -dfx
+RUN git submodule init
+RUN git submodule update
+RUN cmake -DCMAKE_BUILD_TYPE=debug .
+RUN make -j2
+RUN make install
+RUN task --version
+
+# Setup tests
+WORKDIR /root/code/test/
+RUN make
+
+CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]