diff --git a/test/e2e/test-cmd.sh b/test/e2e/test-cmd.sh
index 3f42640f8..1c2ce513b 100755
--- a/test/e2e/test-cmd.sh
+++ b/test/e2e/test-cmd.sh
@@ -26,8 +26,14 @@ REGISTRY=""
 VERSION=""
 
 TESTFILE="v1beta2-controllerrevision.proto"
-# for etcd server that has enabled mTLS 
+# For etcd server that has enabled mTLS
 TLS_ARGS="--cacert /etc/srv/kubernetes/pki/etcd-apiserver-ca.crt --cert /etc/srv/kubernetes/pki/etcd-apiserver-client.crt --key /etc/srv/kubernetes/pki/etcd-apiserver-client.key"
+# Unset the TLS_ARGS if etcd is not enabled.
+gcloud compute --project "${PROJECT}" ssh --zone "${KUBE_GCE_ZONE}" "${CLUSTER_NAME}-master" --command \
+  "cat /etc/kubernetes/manifests/etcd.manifest | grep '\-\-listen-client-urls https:'" && rc=$? || rc=$?
+if [[ $rc -ne 0 ]]; then
+  TLS_ARGS=""
+fi
 
 
 function wait-for-migration()
@@ -137,13 +143,6 @@ etcd_container=$(echo "${result}" | grep "etcd-server-${CLUSTER_NAME}-master" |
 gcloud compute --project "${PROJECT}" ssh --zone "${KUBE_GCE_ZONE}" "${CLUSTER_NAME}-master" --command \
   "docker cp ${TESTFILE} ${etcd_container}:/"
 
-# Check if etcd tls is enabled
-gcloud compute --project "${PROJECT}" ssh --zone "${KUBE_GCE_ZONE}" "${CLUSTER_NAME}-master" --command \
-  "cat /etc/kubernetes/manifests/etcd.manifest | grep '\-\-listen-client-urls https:'" && rc=$? || rc=$?
-if [[ $rc -ne 0 ]]; then
-  TLS_ARGS=""
-fi
-
 # Create the object via etcdctl
 gcloud compute --project "${PROJECT}" ssh --zone "${KUBE_GCE_ZONE}" "${CLUSTER_NAME}-master" --command \
   "docker exec ${etcd_container} /bin/sh -c \"cat /${TESTFILE} | ETCDCTL_API=3 etcdctl ${TLS_ARGS} put /registry/controllerrevisions/default/sample\""