diff --git a/.travis.yml b/.travis.yml
index e836cc0bd..f09282a9c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,12 +22,14 @@ env:
    - secure: "bG4YYWMfl9API0MSRgmOaJrlGLv06tRg9KJNawBieZvBJbITPpxVGJZT3/l/SEJ+Rl15e2dRex4k+MGQlmT2SqPQxTEYWv1qxNigKPPcla7IWeNmWWqW8uVvFjdglojgBOK2k/xErVQtA4zDfi3mwSXH4DKwquXWsoEKmX2SV7M="
    - secure: "Cbvap9ubVKgjPe3hUhI6JGeDZzBXHpOG9RaYKh+SdoIPhKnlJiNOYm1egomi+e4uqJInlFKuVHTw7Ng9Cun6Zm0jIxpkSchv1GpsR7hmB3UGnGed19Dw8121FwuUaktN+4YnbVlsyd+u8EHD3+h58t4eELrLrZolM4rS7DL6caA="
    - secure: "RiBIBfVhhaMjU5ksuwJO3shdvG9FpinBjdSv4co9jg9171SR8edNriedHjVKSIeBhSGNmZmX+twS3dJS/By6tl/LKh9sTynA+ZAYYljkE7jn881B/gMrlYvdAA6og5KvkhV1/0iJWlhuZrMTkhpDR200iLgg3EWBhWjltzmDW/I="
+   - LD_LIBRARY_PATH: '/usr/local/lib'
 
 before_install:
 - source ./scripts/travis_helper.sh
 - source ./scripts/flags.sh
 - (git clone https://github.com/mapbox/mason.git ~/.mason ; sudo ln -s ~/.mason/mason /usr/local/bin/mason)
 - ./scripts/travis_before_install.sh
+- if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then glxinfo; fi
 
 install:
 - make config.gypi
diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index fefd6937f..7c308d580 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -24,8 +24,27 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
                             libboost1.55-dev libboost-regex1.55-dev libcurl4-openssl-dev \
                             libpng-dev libsqlite3-dev
 
+    mapbox_time "install_mesa_deps" \
+    sudo apt-get install -y libpthread-stubs0-dev \
+                            xserver-xorg-dev x11proto-xinerama-dev libx11-xcb-dev \
+                            libxcb-glx0-dev libxrender-dev llvm-3.4 mesa-utils && \
+    sudo apt-get build-dep -y libgl1-mesa-dri libxcb-glx0-dev
+
+    mapbox_time "build_mesa" \
+    curl -sfo MesaLib-10.3.1.tar.gz http://ftp.de.debian.org/debian/pool/main/m/mesa/mesa_10.3.1.orig.tar.gz && \
+    tar -zxf MesaLib-10.3.1.tar.gz && \
+    cd Mesa-10.3.1 && \
+    ./autogen.sh --with-gallium-drivers=svga,swrast --disable-dri \
+        --enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/lib/llvm-3.4 \
+        --without-va && \
+    echo $CXXFLAGS
+    echo $CFLAGS
+    echo $LDFLAGS
+    make && sudo make install && \
+    cd ../
+
     mapbox_time "install_opengl" \
-    sudo apt-get -y install libxi-dev libglu1-mesa-dev x11proto-randr-dev \
+    sudo apt-get -y install libxi-dev x11proto-randr-dev \
                             x11proto-xext-dev libxrandr-dev \
                             x11proto-xf86vidmode-dev libxxf86vm-dev \
                             libxcursor-dev libxinerama-dev
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh
index f306dbcb7..8e2f92163 100755
--- a/scripts/travis_script.sh
+++ b/scripts/travis_script.sh
@@ -8,10 +8,10 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     # build & test Linux
     #
     mapbox_time "compile_program" \
-    make linux -j4 BUILDTYPE=${BUILDTYPE}
+    make linux -j$(nproc) BUILDTYPE=${BUILDTYPE}
 
     mapbox_time "compile_tests" \
-    make test -j4 BUILDTYPE=${BUILDTYPE}
+    make test -j$(nproc) BUILDTYPE=${BUILDTYPE}
 
     mapbox_time "run_tests" \
     ./scripts/run_tests.sh