diff --git a/.buildbot/bionic/Dockerfile b/.buildbot/bionic/Dockerfile
new file mode 100644
index 00000000..0d6245ab
--- /dev/null
+++ b/.buildbot/bionic/Dockerfile
@@ -0,0 +1,12 @@
+FROM ubuntu:bionic AS test_bionic
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update -y && apt-get install -yq --no-install-suggests --no-install-recommends \
+    buildbot-slave git subversion python3-dev libffi-dev python3-setuptools \
+    python3-pip dumb-init curl openssh-client wget \
+    python-qt4 python-pyqt5 \
+    build-essential libcap-dev libmtdev-dev xvfb tor xclip python3-opencv
+
+RUN pip3 install coverage psutil pycrypto \
+    xvfbwrapper python_prctl six
diff --git a/.buildbot/bionic/build.sh b/.buildbot/bionic/build.sh
new file mode 100755
index 00000000..fb782e36
--- /dev/null
+++ b/.buildbot/bionic/build.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+python setup.py install --user
+export PYTHONWARNINGS=all
diff --git a/.buildbot/bionic/test.sh b/.buildbot/bionic/test.sh
new file mode 100755
index 00000000..85b628ac
--- /dev/null
+++ b/.buildbot/bionic/test.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+python checkdeps.py
+python src/bitmessagemain.py -t
+python -bm tests