diff --git a/build.env b/build.env
index 048a1922f..a458d4b02 100644
--- a/build.env
+++ b/build.env
@@ -39,3 +39,4 @@ CHANGE_MINIKUBE_NONE_USER=true
 #   permissions on the host
 #CEPH_CSI_RUN_ALL_TESTS=true
 E2E_TIMEOUT=40m
+DEPLOY_TIMEOUT=10
diff --git a/scripts/travis-functest.sh b/scripts/travis-functest.sh
index c05a76c19..bd9e20920 100755
--- a/scripts/travis-functest.sh
+++ b/scripts/travis-functest.sh
@@ -39,7 +39,7 @@ if [[ "${KUBE_MAJOR}" -ge 1 ]] && [[ "${KUBE_MINOR}" -ge 17 ]]; then
 fi
 
 # functional tests
-go test "${GO_TAGS}" github.com/ceph/ceph-csi/e2e --deploy-timeout=10 -timeout="${E2E_TIMEOUT}" --cephcsi-namespace=cephcsi-e2e-$RANDOM -v -mod=vendor
+go test "${GO_TAGS}" github.com/ceph/ceph-csi/e2e --deploy-timeout="${DEPLOY_TIMEOUT}" -timeout="${E2E_TIMEOUT}" --cephcsi-namespace=cephcsi-e2e-$RANDOM -v -mod=vendor
 
 if [[ "${KUBE_MAJOR}" -ge 1 ]] && [[ "${KUBE_MINOR}" -ge 17 ]]; then
     # delete snapshot CRD
diff --git a/scripts/travis-helmtest.sh b/scripts/travis-helmtest.sh
index b89065729..fb743fd6a 100755
--- a/scripts/travis-helmtest.sh
+++ b/scripts/travis-helmtest.sh
@@ -49,7 +49,7 @@ scripts/install-helm.sh up
 # install cephcsi helm charts
 scripts/install-helm.sh install-cephcsi ${NAMESPACE}
 # functional tests
-go test "${GO_TAGS}" github.com/ceph/ceph-csi/e2e -mod=vendor --deploy-timeout=10 -timeout="${E2E_TIMEOUT}" --cephcsi-namespace=${NAMESPACE} --deploy-cephfs=false --deploy-rbd=false -v
+go test "${GO_TAGS}" github.com/ceph/ceph-csi/e2e -mod=vendor --deploy-timeout="${DEPLOY_TIMEOUT}" -timeout="${E2E_TIMEOUT}" --cephcsi-namespace=${NAMESPACE} --deploy-cephfs=false --deploy-rbd=false -v
 
 #cleanup
 # skip snapshot operation if kube version is less than 1.17.0