diff --git a/misc/docker/archlinux/Dockerfile b/misc/docker/archlinux/Dockerfile
index 273bdb134..186dbd432 100644
--- a/misc/docker/archlinux/Dockerfile
+++ b/misc/docker/archlinux/Dockerfile
@@ -3,18 +3,15 @@ MAINTAINER Florian Bruhin <me@the-compiler.org>
 
 RUN echo 'Server = http://mirror.de.leaseweb.net/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist
 RUN pacman-key --init && pacman-key --populate archlinux && pacman -Sy --noconfirm archlinux-keyring
+RUN pacman -S --noconfirm pacman && pacman-db-upgrade
 
-RUN pacman -Suyy --noconfirm
-RUN pacman-db-upgrade
-
-RUN pacman -S --noconfirm \
+RUN pacman -Suyy --noconfirm \
     git \
     python-tox \
     qt5-base \
     qt5-webkit \
     python-pyqt5 \
     xorg-xinit \
-    herbstluftwm \
     xorg-server-xvfb
 
 RUN echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen && locale-gen
@@ -23,13 +20,9 @@ RUN useradd user && mkdir /home/user && chown -R user:users /home/user
 USER user
 WORKDIR /home/user
 
-ENV DISPLAY=:0
 ENV LC_ALL=en_US.UTF-8
 ENV LANG=en_US.UTF-8
 
-CMD Xvfb -screen 0 800x600x24 :0 & \
-    sleep 2 && \
-    herbstluftwm & \
-    git clone /outside qutebrowser.git && \
+CMD git clone /outside qutebrowser.git && \
     cd qutebrowser.git && \
     tox -e py35
diff --git a/misc/docker/debian-jessie/Dockerfile b/misc/docker/debian-jessie/Dockerfile
index 080346fbf..43acb6aef 100644
--- a/misc/docker/debian-jessie/Dockerfile
+++ b/misc/docker/debian-jessie/Dockerfile
@@ -11,10 +11,10 @@ RUN apt-get -y update && \
             python-tox \
             python3-sip \
             xvfb \
+            xauth \
             git \
             python3-setuptools \
             wget \
-            herbstluftwm \
             locales \
             libjs-pdf
 RUN echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen && locale-gen
@@ -23,13 +23,9 @@ RUN useradd user && mkdir /home/user && chown -R user:users /home/user
 USER user
 WORKDIR /home/user
 
-ENV DISPLAY=:0
 ENV LC_ALL=en_US.UTF-8
 ENV LANG=en_US.UTF-8
 
-CMD Xvfb -screen 0 800x600x24 :0 & \
-    sleep 2 && \
-    herbstluftwm & \
-    git clone /outside qutebrowser.git && \
+CMD git clone /outside qutebrowser.git && \
     cd qutebrowser.git && \
     tox -e py34
diff --git a/misc/docker/ubuntu-xenial/Dockerfile b/misc/docker/ubuntu-xenial/Dockerfile
index 0d012a87d..808f1d84d 100644
--- a/misc/docker/ubuntu-xenial/Dockerfile
+++ b/misc/docker/ubuntu-xenial/Dockerfile
@@ -14,7 +14,6 @@ RUN apt-get -y update && \
             git \
             python3-setuptools \
             wget \
-            herbstluftwm \
             language-pack-en \
             libjs-pdf \
             dbus
@@ -25,13 +24,9 @@ RUN useradd user && mkdir /home/user && chown -R user:users /home/user
 USER user
 WORKDIR /home/user
 
-ENV DISPLAY=:0
 ENV LC_ALL=en_US.UTF-8
 ENV LANG=en_US.UTF-8
 
-CMD Xvfb -screen 0 800x600x24 :0 & \
-    sleep 2 && \
-    herbstluftwm & \
-    git clone /outside qutebrowser.git && \
+CMD git clone /outside qutebrowser.git && \
     cd qutebrowser.git && \
     tox -e py35