diff --git a/.travis.yml b/.travis.yml
index 02df32a8..f238d819 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,13 @@
 language: java
 
+sudo: required
+
+services:
+- docker
+
 install: true
 
 script:
-- ./gradlew check
-- export DISPLAY=:99
-- export LIBGL_ALWAYS_SOFTWARE=1
-- sudo apt-get update -qq --force-yes
-- sudo apt-get install -qq --force-yes mesa-utils libgl1-mesa-glx xvfb
-- /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1400x900x24 -ac +extension GLX +render
-- glxinfo
-- ./gradlew run
\ No newline at end of file
+- docker build -t cabaletta/baritone .
+- docker run cabaletta/baritone "./gradlew test"
+- docker run cabaletta/baritone /bin/sh -c "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1400x900x24 -ac +extension GLX +render; DISPLAY=:99 ./gradlew run"
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..4f128e6f
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,22 @@
+FROM debian:jessie
+
+RUN echo 'deb http://deb.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/jessie-backports.list
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt update -y
+
+RUN apt install --target-release jessie-backports \
+          openjdk-8-jdk \
+          ca-certificates-java \
+          --assume-yes
+
+RUN apt install -qq --force-yes mesa-utils libgl1-mesa-glx libxcursor1 libxrandr2 libxxf86vm1 x11-xserver-utils xfonts-base xserver-common
+
+ADD . /code
+
+RUN dpkg -i /code/xvfb_1.16.4-1_amd64.deb
+
+WORKDIR /code
+
+RUN ./gradlew assemble
\ No newline at end of file
diff --git a/xvfb_1.16.4-1_amd64.deb b/xvfb_1.16.4-1_amd64.deb
new file mode 100644
index 00000000..c3ef3de4
Binary files /dev/null and b/xvfb_1.16.4-1_amd64.deb differ