diff --git a/.travis.yml b/.travis.yml
index 915eae57..5c36e27e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,43 @@
 sudo: false
 language: python
+
+python:
+	- 3.4
+
+addons:
+	apt:
+		packages:
+		- locales
+		- ghostscript
+		- tesseract-ocr
+		- tesseract-ocr-deu tesseract-ocr-eng tesseract-ocr-fra
+		- qpdf
+		- poppler-utils
+		- wget
+		- gcc-4.8
+		- libavformat-dev
+		- libavcodec-dev
+		- libavutil-dev
+		- autoconf
+		- automake
+		- make
+		- pkg-config
+		- xsltproc
+
+
+# before_script:
+# 	- wget -q https://github.com/Flameeyes/unpaper/archive/unpaper-6.1.tar.gz
+# 	- tar -xvf unpaper-6.1.tar.gz
+# 	- cd unpaper-6.1.tar.gz && autoreconf -i && ./configure --prefix=/tmp/unpaper && make && make install
+
+script:
+	- pip install --upgrade pip
+	- python setup.py clean
+	- python setup.py install
+
+after_success:
+	- py.test
+
+
 os:
 	- linux
-	- osx
-matrix:
-	include:
-		- python: "3.4"
-		- python: "3.5"
-
diff --git a/Dockerfile b/Dockerfile
index 27cefca5..b2bc370b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,12 +44,13 @@ RUN apt-get install -y \
   xsltproc
 
 WORKDIR /root
-RUN wget https://github.com/Flameeyes/unpaper/archive/unpaper-6.1.tar.gz
+RUN wget -q https://github.com/Flameeyes/unpaper/archive/unpaper-6.1.tar.gz
 RUN tar xf unpaper-6.1.tar.gz
 WORKDIR /root/unpaper-unpaper-6.1
 RUN autoreconf -i
 RUN ./configure CFLAGS="-O2 -march=native -pipe -flto"
 RUN make -j install
+WORKDIR /
 
 RUN apt-get remove -y \
   gcc \
@@ -59,7 +60,7 @@ RUN apt-get remove -y \
   xsltproc \
   make
 RUN apt-get autoremove -y && apt-get clean -y
-RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /root/*
 
 # Set up a Python virtualenv and take all of the system packages, so we can
 # rely on the platform packages rather than importing GCC and compiling them