diff --git a/build/kibana/Dockerfile b/build/kibana/Dockerfile
index dc12920..d332f32 100644
--- a/build/kibana/Dockerfile
+++ b/build/kibana/Dockerfile
@@ -6,7 +6,6 @@ EXPOSE 5601
 
 WORKDIR /usr/share/kibana
 RUN curl -Ls ${KIBANA_DOWNLOAD_URL} | tar --strip-components=1 -zxf - && \
-    bin/kibana-plugin install ${X_PACK_URL} && \
     ln -s /usr/share/kibana /opt/kibana
 
 # Set some Kibana configuration defaults.
@@ -21,5 +20,6 @@ ADD ssl/kibana.example.org.* /usr/share/kibana/config/
 
 RUN usermod --home /usr/share/kibana kibana
 USER kibana
+RUN bin/kibana-plugin install ${X_PACK_URL}
 ENV PATH=/usr/share/kibana/bin:$PATH
 CMD /usr/local/bin/kibana-docker
diff --git a/test/direct/test_kibana_image.py b/test/direct/test_kibana_image.py
index c05b175..8ad5906 100644
--- a/test/direct/test_kibana_image.py
+++ b/test/direct/test_kibana_image.py
@@ -23,3 +23,8 @@ def test_default_environment_contains_no_kibana_config():
     defined_vars = [line.split('=')[0] for line in stdout_of('env').split()]
     for var in defined_vars:
         assert var in acceptable_vars
+
+
+def test_all_files_in_optimize_directory_are_owned_by_kibana():
+    bad_files = stdout_of('find /usr/share/kibana/optimize ! -user kibana').split()
+    assert len(bad_files) is 0