diff --git a/test/minio/1.0.1/templates/_helpers.tpl b/test/minio/1.0.1/templates/_helpers.tpl
index a14570d395..c769c2fb2a 100644
--- a/test/minio/1.0.1/templates/_helpers.tpl
+++ b/test/minio/1.0.1/templates/_helpers.tpl
@@ -4,13 +4,3 @@ Determine secret name.
 {{- define "minio.secretName" -}}
 {{- include "common.names.fullname" . -}}
 {{- end -}}
-
-
-{{/*
-Properly format optional additional arguments to Minio binary
-*/}}
-{{- define "minio.extraArgs" -}}
-{{- range .Values.extraArgs -}}
-{{ " " }}{{ . }}
-{{- end -}}
-{{- end -}}
diff --git a/test/minio/1.0.1/templates/deployment.yaml b/test/minio/1.0.1/templates/deployment.yaml
index fb33129703..c184498c93 100644
--- a/test/minio/1.0.1/templates/deployment.yaml
+++ b/test/minio/1.0.1/templates/deployment.yaml
@@ -23,7 +23,7 @@ spec:
           command:
             - "/bin/sh"
             - "-ce"
-            - "/usr/bin/docker-entrypoint.sh minio server /export {{- template "minio.extraArgs" . }}"
+            - "/usr/bin/docker-entrypoint.sh minio server /export {{ (.Values.extraArgs | default list) | join " " }}"
           volumeMounts:
             - name: export
               mountPath: /export
diff --git a/test/minio/1.0.1/templates/secrets.yaml b/test/minio/1.0.1/templates/secrets.yaml
index bfe4f57827..f44495e5e1 100644
--- a/test/minio/1.0.1/templates/secrets.yaml
+++ b/test/minio/1.0.1/templates/secrets.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "minio.secretName" . }}
-  labels: {{ include "common.labels" | nindent 4 }}
+  labels: {{ include "common.labels" . | nindent 4 }}
 type: Opaque
 data:
   accesskey: {{ if .Values.accessKey }}{{ .Values.accessKey | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 20 | b64enc | quote }}{{ end }}