diff --git a/.travis.yml b/.travis.yml
index fee72efa..de43d0e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,6 +38,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 25c0727c..1f48fe19 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -48,6 +48,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 00000000..c8e09037
--- /dev/null
+++ b/test/docker/ubuntu2004
@@ -0,0 +1,41 @@
+FROM ubuntu:20.04
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update && yes | unminimize
+RUN apt-get install -y \
+            cmake \
+            g++ \
+            git \
+            locales \
+            man \
+            man-db \
+            python3 \
+            python3-dateutil \
+            tzdata
+
+# Setup environment
+RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
+RUN ln -fs /usr/share/zoneinfo/Europe/Berlin /etc/localtime
+RUN dpkg-reconfigure -f noninteractive tzdata
+
+ENV LC_ALL en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US.UTF-8
+RUN locale-gen "en_US.UTF-8"
+
+# Setup timewarrior
+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
+
+# Setup tests
+WORKDIR /root/code/test/
+RUN make
+
+CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems ; FAILED=$? ; echo timew $( timew --version ) ; python --version ; cmake --version ; gcc --version ; exit $FAILED"]