diff --git a/incubator/kafka/Chart.yaml b/incubator/kafka/Chart.yaml
index da92b40027..7c774da584 100755
--- a/incubator/kafka/Chart.yaml
+++ b/incubator/kafka/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: Apache Kafka is publish-subscribe messaging rethought as a distributed
   commit log.
 name: kafka
-version: 0.20.8
+version: 0.20.9
 appVersion: 5.0.1
 keywords:
 - kafka
diff --git a/incubator/kafka/README.md b/incubator/kafka/README.md
index c9f3b9c4d8..25f7fc7b3a 100644
--- a/incubator/kafka/README.md
+++ b/incubator/kafka/README.md
@@ -136,6 +136,7 @@ following configurable parameters:
 | `prometheus.operator.prometheusRule.rules`            | Define the prometheus rules. See values file for examples                                                                                                                | `{}`                                                               |
 | `configJob.backoffLimit`                              | Number of retries before considering kafka-config job as failed                                                                                                          | `6`                                                                |
 | `topics`                                              | List of topics to create & configure. Can specify name, partitions, replicationFactor, reassignPartitions, config. See values.yaml                                       | `[]` (Empty list)                                                  |
+| `testsEnabled`                                        | Enable/disable the chart's tests                                                                                                                                         | `true`                                                             |
 | `zookeeper.enabled`                                   | If True, installs Zookeeper Chart                                                                                                                                        | `true`                                                             |
 | `zookeeper.resources`                                 | Zookeeper resource requests and limits                                                                                                                                   | `{}`                                                               |
 | `zookeeper.env`                                       | Environmental variables provided to Zookeeper Zookeeper                                                                                                                  | `{ZK_HEAP_SIZE: "1G"}`                                             |
diff --git a/incubator/kafka/templates/tests/test_topic_create_consume_produce.yaml b/incubator/kafka/templates/tests/test_topic_create_consume_produce.yaml
index 5e7a7ea092..e7dd5c90dc 100644
--- a/incubator/kafka/templates/tests/test_topic_create_consume_produce.yaml
+++ b/incubator/kafka/templates/tests/test_topic_create_consume_produce.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.testsEnabled -}}
 apiVersion: v1
 kind: Pod
 metadata:
@@ -21,3 +22,4 @@ spec:
       # Consume a test message from the topic
       kafka-console-consumer --bootstrap-server {{ include "kafka.fullname" . }}-headless:9092 --topic helm-test-topic-create-consume-produce --from-beginning --timeout-ms 2000 --max-messages 1 | grep "$MESSAGE"
   restartPolicy: Never
+{{- end }}
\ No newline at end of file
diff --git a/incubator/kafka/values.yaml b/incubator/kafka/values.yaml
index f1e9664a79..ceddc24913 100644
--- a/incubator/kafka/values.yaml
+++ b/incubator/kafka/values.yaml
@@ -459,6 +459,11 @@ topics: []
   #     - user: all
   #       operations: [ All ]
 
+## Enable/disable the chart's tests.  Useful if using this chart as a dependency of
+## another chart and you don't want these tests running when trying to develop and
+## test your own chart.
+testsEnabled: true
+
 # ------------------------------------------------------------------------------
 # Zookeeper:
 # ------------------------------------------------------------------------------