diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6ddded455..ca3028522 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,13 +1,15 @@
 FROM ubuntu:14.04
 
-RUN apt-get update -y && \
-apt-get install -y build-essential git-core python-pip python-software-properties software-properties-common && \
-rm -rf /var/lib/apt/lists/*
+RUN apt-get update -y
+RUN apt-get install -y build-essential git-core python-pip python-software-properties software-properties-common
 
-RUN apt-get -y install gcc-4.8 g++-4.8 curl automake gdb libtool make cmake pkg-config libboost1.55-dev llvm-3.4 \
-protobuf-compiler libprotoc-dev libprotobuf7 libprotobuf-dev libbz2-dev libstxxl-dev libstxxl1 libxml2-dev \
-libzip-dev lua5.1 liblua5.1-0-dev rubygems libtbb-dev libgdal-dev && \
-pip install awscli
+RUN apt-get -y install gcc-4.8 g++-4.8 libboost1.55-all-dev llvm-3.4
+RUN apt-get -y install protobuf-compiler libprotoc-dev libprotobuf-dev
+RUN apt-get -y install libbz2-dev libstxxl-dev libstxxl1 libxml2-dev
+RUN apt-get -y install libzip-dev lua5.1 liblua5.1-0-dev libtbb-dev libgdal-dev ruby1.9
+RUN apt-get -y install curl cmake
+
+RUN pip install awscli
 
 # luabind
 RUN curl https://gist.githubusercontent.com/DennisOSRM/f2eb7b948e6fe1ae319e/raw/install-luabind.sh | sudo bash
diff --git a/docker/run-gcc.sh b/docker/run-gcc.sh
index ea07f6709..df45b42f5 100755
--- a/docker/run-gcc.sh
+++ b/docker/run-gcc.sh
@@ -10,6 +10,6 @@ docker build \
 docker run \
     -i \
     -e "CXX=g++" \
-    -v `pwd`:/home/mapbox/build \
+    -v `pwd`:/home/mapbox/osrm-backend \
     -t mapbox/osrm:linux \
-    build/docker/test.sh
+    osrm-backend/docker/test.sh
diff --git a/docker/test.sh b/docker/test.sh
index b0b6cb6b5..8bbb7b20a 100755
--- a/docker/test.sh
+++ b/docker/test.sh
@@ -7,11 +7,13 @@ export TRAVIS_OS_NAME=linux
 export CMAKEOPTIONS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++-4.8"
 export OSRM_PORT=5000
 export OSRM_TIMEOUT=60
+export PATH=$PATH:/home/mapbox/.gem/ruby/1.9.1/bin:/home/mapbox/osrm-backend/vendor/bundle/ruby/1.9.1/bin
+export BRANCH=develop
 
-rvm use 1.9.3
-gem install bundler
-bundle install
-
+cd /home/mapbox/osrm-backend
+gem install --user-install bundler
+bundle install --path vendor/bundle
+[ -d build ] && rm -rf build
 mkdir -p build
 cd build
 cmake .. $CMAKEOPTIONS -DBUILD_TOOLS=1
@@ -21,4 +23,4 @@ make tests -j`nproc`
 ./datastructure-tests
 ./algorithm-tests
 cd ..
-cucumber -p verify
+bundle exec cucumber -p verify