diff --git a/libbeat/Dockerfile b/libbeat/Dockerfile
index a09e69447e8..3c4b4283bcd 100644
--- a/libbeat/Dockerfile
+++ b/libbeat/Dockerfile
@@ -4,7 +4,8 @@ MAINTAINER Nicolas Ruflin <ruflin@elastic.co>
 
 RUN set -x && \
     apt-get update && \
-    apt-get install -y netcat python-virtualenv python-pip && \
+    apt-get install -y --no-install-recommends \
+         netcat python-pip virtualenv && \
     apt-get clean
 
 ENV PYTHON_ENV=/tmp/python-env
diff --git a/libbeat/docker-compose.yml b/libbeat/docker-compose.yml
index 1620948e1b8..24b287b2105 100644
--- a/libbeat/docker-compose.yml
+++ b/libbeat/docker-compose.yml
@@ -59,7 +59,4 @@ services:
 
   # Overloading kibana with a simple image as it is not needed here
   kibana:
-    build:
-      context: ${PWD}/../testing/environments/
-      dockerfile: Dockerfile
-      args: []
+    image: alpine:latest
diff --git a/libbeat/scripts/docker-entrypoint.sh b/libbeat/scripts/docker-entrypoint.sh
index 32b0c280911..44e7c2cd876 100755
--- a/libbeat/scripts/docker-entrypoint.sh
+++ b/libbeat/scripts/docker-entrypoint.sh
@@ -81,7 +81,7 @@ waitFor() {
     done
 
     echo
-    echo >&2 '${3} is not available'
+    echo >&2 "${3} is not available"
     echo >&2 "Address: ${1}:${2}"
 }
 
diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
index 123bf642e54..31b6c548d9f 100644
--- a/metricbeat/Dockerfile
+++ b/metricbeat/Dockerfile
@@ -3,7 +3,8 @@ MAINTAINER Nicolas Ruflin <ruflin@elastic.co>
 
 RUN set -x && \
     apt-get update && \
-    apt-get install -y netcat python-virtualenv python-pip && \
+    apt-get install -y --no-install-recommends \
+         netcat python-pip virtualenv && \
     apt-get clean
 
 # Setup work environment
diff --git a/metricbeat/docker-compose.yml b/metricbeat/docker-compose.yml
index 991fe07a29e..f05b4f9b0f5 100644
--- a/metricbeat/docker-compose.yml
+++ b/metricbeat/docker-compose.yml
@@ -44,9 +44,7 @@ services:
 
   # Overloading kibana with a simple image as it is not needed here
   kibana:
-    build:
-      context: ${PWD}/../testing/environments/
-      dockerfile: Dockerfile
+    image: alpine:latest
 
   # Modules
   apache:
diff --git a/testing/environments/Dockerfile b/testing/environments/Dockerfile
index 79411d5d9ab..0543985dadd 100644
--- a/testing/environments/Dockerfile
+++ b/testing/environments/Dockerfile
@@ -6,6 +6,3 @@ MAINTAINER Nicolas Ruflin <ruflin@elastic.co>
 RUN apt-get update && \
     apt-get install -y curl nano wget zip && \
     apt-get clean
-
-
-ARG KIBANA_VERSION
diff --git a/testing/environments/docker/sredis/Dockerfile b/testing/environments/docker/sredis/Dockerfile
index adbc826ce4c..3b6e9551932 100644
--- a/testing/environments/docker/sredis/Dockerfile
+++ b/testing/environments/docker/sredis/Dockerfile
@@ -1,8 +1,6 @@
-FROM debian:8.4
+FROM alpine:edge
 
-RUN apt-get update \
-  && apt-get upgrade -y \
-  && apt-get install stunnel4 -y
+RUN apk add --no-cache stunnel
 
 COPY stunnel.conf /etc/stunnel/stunnel.conf
 COPY pki /etc/pki