diff --git a/stable/kibana/Chart.yaml b/stable/kibana/Chart.yaml
index fde434f9772d..7faf3ba4c99d 100644
--- a/stable/kibana/Chart.yaml
+++ b/stable/kibana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: kibana
-version: 3.2.2
+version: 3.2.3
 appVersion: 6.7.0
 description: Kibana is an open source data visualization plugin for Elasticsearch
 icon: https://raw.githubusercontent.com/elastic/kibana/master/src/ui/public/icons/kibana-color.svg
diff --git a/stable/kibana/README.md b/stable/kibana/README.md
index dd9cdf213206..1dd83fd78244 100644
--- a/stable/kibana/README.md
+++ b/stable/kibana/README.md
@@ -118,6 +118,7 @@ The following table lists the configurable parameters of the kibana chart and th
 | `extraConfigMapMounts`                     | Additional configmaps to be mounted                                    | `[]`                                  |
 | `deployment.annotations`                   | Annotations for deployment                                             | `{}`                                  |
 | `initContainers`                           | Init containers to add to the kibana deployment                        | `{}`                                  |
+| `testFramework.enabled`                    | enable the test framework                                              | true                                  |
 | `testFramework.image`                      | `test-framework` image repository.                                     | `dduportal/bats`                      |
 | `testFramework.tag`                        | `test-framework` image tag.                                            | `0.4.0`                               |
 
diff --git a/stable/kibana/templates/tests/test-configmap.yaml b/stable/kibana/templates/tests/test-configmap.yaml
index 912755e2974f..ca67f9612140 100644
--- a/stable/kibana/templates/tests/test-configmap.yaml
+++ b/stable/kibana/templates/tests/test-configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.testFramework.enabled }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -33,3 +34,4 @@ data:
       [ "$result" == "" ]
       {{- end }}
     }
+{{- end }}
diff --git a/stable/kibana/templates/tests/test.yaml b/stable/kibana/templates/tests/test.yaml
index 8a518fde8d6e..74d5827d5165 100644
--- a/stable/kibana/templates/tests/test.yaml
+++ b/stable/kibana/templates/tests/test.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.testFramework.enabled }}
 apiVersion: v1
 kind: Pod
 metadata:
@@ -40,3 +41,4 @@ spec:
   - name: tools
     emptyDir: {}
   restartPolicy: Never
+{{- end }}
diff --git a/stable/kibana/values.yaml b/stable/kibana/values.yaml
index 135dc48d0d21..5819e96bf4c8 100644
--- a/stable/kibana/values.yaml
+++ b/stable/kibana/values.yaml
@@ -4,6 +4,7 @@ image:
   pullPolicy: "IfNotPresent"
 
 testFramework:
+  enabled: "true"
   image: "dduportal/bats"
   tag: "0.4.0"