diff --git a/.travis.yml b/.travis.yml
index f651092ee..156343414 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,10 @@ compiler:
  - gcc
  - clang
 
+cache:
+    directories:
+    - mapnik-packaging
+
 before_install:
 - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
 - sudo add-apt-repository --yes ppa:boost-latest/ppa
@@ -14,20 +18,12 @@ before_install:
 - sudo apt-get -y install libxi-dev libglu1-mesa-dev x11proto-randr-dev x11proto-xext-dev libxrandr-dev x11proto-xf86vidmode-dev libxxf86vm-dev libxcursor-dev
 
 install:
-- export CURRENT_DIR=$(pwd)
-- git clone https://github.com/glfw/glfw.git
-- cd glfw
-- git checkout -qf 3.0.4
-- mkdir build
-- cd build
-- cmake ../ -DCMAKE_C_COMPILER_ENV_VAR=gcc-4.8 -DGLFW_BUILD_EXAMPLES=off -DGLFW_BUILD_TESTS=off -DGLFW_BUILD_DOCS=off
-- make
-- sudo make install
-- cd ${CURRENT_DIR}
+- ./setup-libraries.sh
 
 before_script:
 - export CXX="g++-4.8"
 
 script:
-- ./configure
-- make llmr linux test
+- make llmr
+- make linux
+- make run-tests