diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index 97ee05f0..eac63e1a 100755
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER itzg
 
 RUN apk -U add bash
 
-ENV ES_VERSION=5.1.1
+ENV ES_VERSION=5.1.2
 
 ADD https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$ES_VERSION.tar.gz /tmp/es.tgz
 RUN cd /usr/share && \
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index 1895029d..7f02dd9c 100755
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -2,7 +2,7 @@ FROM openjdk:8u111-jre
 
 MAINTAINER itzg
 
-ENV KIBANA_VERSION 5.1.1
+ENV KIBANA_VERSION 5.1.2
 
 ADD https://artifacts.elastic.co/downloads/kibana/kibana-${KIBANA_VERSION}-linux-x86_64.tar.gz /tmp/kibana.tgz
 
diff --git a/kibana/docker-compose-test.yml b/kibana/docker-compose-test.yml
new file mode 100644
index 00000000..7b484fd1
--- /dev/null
+++ b/kibana/docker-compose-test.yml
@@ -0,0 +1,12 @@
+version: '2'
+
+services:
+  es:
+    build: ../elasticsearch
+    ports:
+      - "9200:9200"
+
+  kibana:
+    build: .
+    ports:
+      - "5601:5601"