diff --git a/.buildbot/tox-bionic/Dockerfile b/.buildbot/tox-bionic/Dockerfile
new file mode 100644
index 00000000..5280289b
--- /dev/null
+++ b/.buildbot/tox-bionic/Dockerfile
@@ -0,0 +1,18 @@
+FROM ubuntu:bionic
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update
+
+RUN apt-get install -yq --no-install-suggests --no-install-recommends \
+    software-properties-common build-essential libcap-dev libffi-dev \
+    libssl-dev python-all-dev python-setuptools \
+    python3-dev python3-pip python3.8 python3.8-dev python3.8-venv \
+    python-msgpack python-qt4 language-pack-en qt5dxcb-plugin tor xvfb
+
+RUN python3.8 -m pip install setuptools wheel
+RUN python3.8 -m pip install --upgrade pip tox virtualenv
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
diff --git a/.buildbot/tox/test.sh b/.buildbot/tox-bionic/test.sh
similarity index 100%
rename from .buildbot/tox/test.sh
rename to .buildbot/tox-bionic/test.sh
diff --git a/.buildbot/tox-focal/Dockerfile b/.buildbot/tox-focal/Dockerfile
new file mode 100644
index 00000000..116317f3
--- /dev/null
+++ b/.buildbot/tox-focal/Dockerfile
@@ -0,0 +1,13 @@
+FROM ubuntu:focal
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update
+
+RUN apt-get install -yq --no-install-suggests --no-install-recommends \
+    software-properties-common build-essential libcap-dev libffi-dev \
+    libssl-dev python-all-dev python-setuptools \
+    python3-dev python3-pip python3.9 python3.9-dev python3.9-venv \
+    language-pack-en qt5dxcb-plugin tor xvfb
+
+RUN python3.9 -m pip install --upgrade pip tox virtualenv
diff --git a/.buildbot/tox-focal/test.sh b/.buildbot/tox-focal/test.sh
new file mode 120000
index 00000000..a9f8525c
--- /dev/null
+++ b/.buildbot/tox-focal/test.sh
@@ -0,0 +1 @@
+../tox-bionic/test.sh
\ No newline at end of file
diff --git a/.buildbot/tox/Dockerfile b/.buildbot/tox/Dockerfile
deleted file mode 100644
index 931bc0f7..00000000
--- a/.buildbot/tox/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM ubuntu:bionic AS tox
-
-RUN apt-get update
-
-# Common apt packages
-RUN apt-get install -yq --no-install-suggests --no-install-recommends \
-    software-properties-common build-essential libcap-dev libssl-dev \
-    python-all-dev python-setuptools wget xvfb language-pack-en \
-    libffi-dev python3-dev python3-pip python3.8 python3.8-dev python3.8-venv \
-    python-msgpack python-pip python-qt4 python-six qtbase5-dev qt5-default \
-    tor
-
-RUN python3.8 -m pip install setuptools wheel
-RUN python3.8 -m pip install --upgrade pip tox virtualenv
-
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8