diff --git a/.kokoro/appengine/test-deployment/common.cfg b/.kokoro/appengine/test-deployment/common.cfg
index 4bc6c78e36..b2b0b5f32b 100644
--- a/.kokoro/appengine/test-deployment/common.cfg
+++ b/.kokoro/appengine/test-deployment/common.cfg
@@ -19,11 +19,4 @@ env_vars: {
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
     value: "github/nodejs-docs-samples/.kokoro/build-with-appengine.sh"
-}
-
-
-# Used in `gcloud app deploy ${APPENGINE_ENVIRONMENT}.yaml
-env_vars: {
-    key: "APPENGINE_ENVIRONMENT"
-    value: "app"
 }
\ No newline at end of file
diff --git a/.kokoro/appengine/test-deployment/hello-world-flex.cfg b/.kokoro/appengine/test-deployment/hello-world-flex.cfg
index 2cf566c297..dd6ae82f67 100644
--- a/.kokoro/appengine/test-deployment/hello-world-flex.cfg
+++ b/.kokoro/appengine/test-deployment/hello-world-flex.cfg
@@ -4,4 +4,10 @@
 env_vars: {
     key: "PROJECT"
     value: "appengine/hello-world/flexible"
+}
+
+# flexible or standard
+env_vars: {
+    key: "APPENGINE_ENVIRONMENT"
+    value: "flexible"
 }
\ No newline at end of file
diff --git a/.kokoro/appengine/test-deployment/hello-world-standard.cfg b/.kokoro/appengine/test-deployment/hello-world-standard.cfg
index 61cf999d85..4c44d215c3 100644
--- a/.kokoro/appengine/test-deployment/hello-world-standard.cfg
+++ b/.kokoro/appengine/test-deployment/hello-world-standard.cfg
@@ -4,4 +4,10 @@
 env_vars: {
     key: "PROJECT"
     value: "appengine/hello-world/standard"
+}
+
+# flexible or standard
+env_vars: {
+    key: "APPENGINE_ENVIRONMENT"
+    value: "standard"
 }
\ No newline at end of file
diff --git a/.kokoro/appengine/test-deployment/metadata-flex.cfg b/.kokoro/appengine/test-deployment/metadata-flex.cfg
index 1cfc090954..f874f8bcbd 100644
--- a/.kokoro/appengine/test-deployment/metadata-flex.cfg
+++ b/.kokoro/appengine/test-deployment/metadata-flex.cfg
@@ -4,4 +4,10 @@
 env_vars: {
     key: "PROJECT"
     value: "appengine/metadata/flexible"
+}
+
+# flexible or standard
+env_vars: {
+    key: "APPENGINE_ENVIRONMENT"
+    value: "flexible"
 }
\ No newline at end of file
diff --git a/.kokoro/appengine/test-deployment/metadata-standard.cfg b/.kokoro/appengine/test-deployment/metadata-standard.cfg
index 4b24812553..ca24e04ad7 100644
--- a/.kokoro/appengine/test-deployment/metadata-standard.cfg
+++ b/.kokoro/appengine/test-deployment/metadata-standard.cfg
@@ -4,4 +4,10 @@
 env_vars: {
     key: "PROJECT"
     value: "appengine/metadata/standard"
+}
+
+# flexible or standard
+env_vars: {
+    key: "APPENGINE_ENVIRONMENT"
+    value: "standard"
 }
\ No newline at end of file
diff --git a/.kokoro/appengine/test-deployment/storage-flex.cfg b/.kokoro/appengine/test-deployment/storage-flex.cfg
index 57325f6ca6..4713ca6d95 100644
--- a/.kokoro/appengine/test-deployment/storage-flex.cfg
+++ b/.kokoro/appengine/test-deployment/storage-flex.cfg
@@ -4,4 +4,10 @@
 env_vars: {
     key: "PROJECT"
     value: "appengine/storage/flexible"
+}
+
+# flexible or standard
+env_vars: {
+    key: "APPENGINE_ENVIRONMENT"
+    value: "flexible"
 }
\ No newline at end of file
diff --git a/.kokoro/appengine/test-deployment/storage-standard.cfg b/.kokoro/appengine/test-deployment/storage-standard.cfg
index 678b37a417..e0a3a62fd3 100644
--- a/.kokoro/appengine/test-deployment/storage-standard.cfg
+++ b/.kokoro/appengine/test-deployment/storage-standard.cfg
@@ -4,4 +4,10 @@
 env_vars: {
     key: "PROJECT"
     value: "appengine/storage/standard"
+}
+
+# flexible or standard
+env_vars: {
+    key: "APPENGINE_ENVIRONMENT"
+    value: "standard"
 }
\ No newline at end of file
diff --git a/.kokoro/build-with-appengine.sh b/.kokoro/build-with-appengine.sh
index 22221c3f12..5767a2c52c 100755
--- a/.kokoro/build-with-appengine.sh
+++ b/.kokoro/build-with-appengine.sh
@@ -48,7 +48,7 @@ gcloud config set project $GCLOUD_PROJECT
 
 
 # Deploy the app
-gcloud app deploy ${APPENGINE_ENVIRONMENT}.yaml --version $GAE_VERSION --no-promote --quiet
+gcloud app deploy --version $GAE_VERSION --no-promote --quiet
 if [ -e "worker.yaml" ]; then
   gcloud app deploy worker.yaml --version ${GAE_VERSION} --no-promote --quiet
 fi