diff --git a/.travis.yml b/.travis.yml
index ff5ba03..05e39e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,10 +12,6 @@ python:
   - "3.6"
 services:
   - docker
-before_install:
-  # Setup virtual framebuffer
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
 install:
   # Install coverage dependencies
   - pip install coverage coveralls
@@ -23,7 +19,6 @@ install:
   - pushd $TRAVIS_BUILD_DIR
   - docker-compose build --build-arg TASK_VERSION=$TASK_VERSION tests
 script:
-  - xhost +local:root
   - make test
 after_success:
   - ls /tmp/taskwiki-coverage
diff --git a/Dockerfile b/Dockerfile
index 3878a7b..f093d64 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM fedora:27
 ARG TASK_VERSION
 
 RUN dnf update -y
-RUN dnf install procps-ng psmisc which vim curl git gvim gcc gcc-c++ cmake make gnutls-devel libuuid-devel -y
+RUN dnf install procps-ng psmisc which vim curl git gvim gcc gcc-c++ cmake make gnutls-devel libuuid-devel xorg-x11-server-Xvfb -y
 
 # Setup language environment
 ENV LC_ALL en_US.UTF-8
@@ -34,4 +34,4 @@ RUN pip3 install -r requirements.txt
 RUN mkdir /root/.vim/bundle/taskwiki
 WORKDIR /root/.vim/bundle/taskwiki
 
-CMD ["sh", "-c", "python3 -m pytest -vv tests/"]
+CMD xvfb-run python3 -m pytest -vv tests/
diff --git a/docker-compose.yml b/docker-compose.yml
index babbb54..5c893ad 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,16 +3,8 @@ services:
   tests:
     build: .
     volumes:
-      - "/etc/group:/etc/group:ro"
-      - "/etc/passwd:/etc/passwd:ro"
-      - "/etc/shadow:/etc/shadow:ro"
-      - "/etc/sudoers.d:/etc/sudoers.d:ro"
-      - "/tmp/.X11-unix:/tmp/.X11-unix:rw"
-      - "$HOME/.Xauthority:/root/.Xauthority:rw"
-      - ".:/root/.vim/bundle/taskwiki:rw"
+      - ".:/root/.vim/bundle/taskwiki:ro"
     network_mode: "host"
-    environment:
-      - DISPLAY
     security_opt:
       - label=type:container_runtime_t
     tty: true