diff --git a/ci/scripts/linux/script.sh b/ci/scripts/linux/script.sh
index 8ee5488..fcbdac5 100644
--- a/ci/scripts/linux/script.sh
+++ b/ci/scripts/linux/script.sh
@@ -18,4 +18,4 @@
 # along with Flom.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-travis_wait docker run --rm -v $(pwd):/source -v $(pwd)/build:/build -e BUILD_TYPE=${BUILD_TYPE} -e CXX=${COMPILER} -e ENABLE_TEST=${ENABLE_TEST} -e RC_PARAMS="${RC_PARAMS}" test
+travis_wait 30 docker run --rm -v $(pwd):/source -v $(pwd)/build:/build -e BUILD_TYPE=${BUILD_TYPE} -e CXX=${COMPILER} -e ENABLE_TEST=${ENABLE_TEST} -e RC_PARAMS="${RC_PARAMS}" test
diff --git a/ci/test-image-cross/Dockerfile b/ci/test-image-cross/Dockerfile
index e4a6bf0..bfd39bc 100644
--- a/ci/test-image-cross/Dockerfile
+++ b/ci/test-image-cross/Dockerfile
@@ -29,7 +29,7 @@ RUN ["cross-build-start"]
 RUN DEBIAN_FRONTEND=noninteractive \
     && apt-get update -y \
     && apt-get install -y --no-install-recommends build-essential wget bash git ruby ruby-dev rpm bsdtar libboost-dev cmake libprotobuf-dev protobuf-compiler \
-    && gem install --no-document fpm
+    && gem install --no-document rake fpm
 
 RUN ["cross-build-end"]
 
diff --git a/ci/test-image/Dockerfile b/ci/test-image/Dockerfile
index 6d462c6..0aa3bf6 100644
--- a/ci/test-image/Dockerfile
+++ b/ci/test-image/Dockerfile
@@ -27,7 +27,7 @@ ENV BUILD_TYPE="Release"
 RUN DEBIAN_FRONTEND=noninteractive \
     && apt-get update -y \
     && apt-get install -y --no-install-recommends build-essential clang libc++-dev libc++abi-dev wget bash git ruby ruby-dev rpm bsdtar libprotobuf-dev protobuf-compiler cmake libboost-dev \
-    && gem install --no-document fpm
+    && gem install --no-document rake fpm
 
 COPY image-scripts/build.sh /
 COPY image-scripts/package.sh /