diff --git a/test/docker/fedora28 b/test/docker/fedora28
new file mode 100644
index 000000000..da31b8793
--- /dev/null
+++ b/test/docker/fedora28
@@ -0,0 +1,26 @@
+FROM fedora:28
+
+RUN dnf update -y
+RUN dnf install python git gcc gcc-c++ cmake make gnutls-devel libuuid-devel -y
+
+# Setup language environment
+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 ; ./problems ; cat all.log | grep 'not ok'"]
diff --git a/test/docker/ubuntu1604 b/test/docker/ubuntu1604
new file mode 100644
index 000000000..5ebe52fa1
--- /dev/null
+++ b/test/docker/ubuntu1604
@@ -0,0 +1,27 @@
+FROM ubuntu:16.04
+
+RUN apt-get update
+RUN apt-get install -y build-essential cmake git uuid-dev libgnutls28-dev
+RUN apt-get install -y python
+
+# Setup language environment
+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 ; ./problems ; cat all.log | grep 'not ok'"]