diff --git a/.kokoro/appengine/test-deployment/hello-world-flex.cfg b/.kokoro/appengine/test-deployment/hello-world-flex.cfg
index dd6ae82f67..2cf566c297 100644
--- a/.kokoro/appengine/test-deployment/hello-world-flex.cfg
+++ b/.kokoro/appengine/test-deployment/hello-world-flex.cfg
@@ -4,10 +4,4 @@
 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 4c44d215c3..61cf999d85 100644
--- a/.kokoro/appengine/test-deployment/hello-world-standard.cfg
+++ b/.kokoro/appengine/test-deployment/hello-world-standard.cfg
@@ -4,10 +4,4 @@
 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 f874f8bcbd..1cfc090954 100644
--- a/.kokoro/appengine/test-deployment/metadata-flex.cfg
+++ b/.kokoro/appengine/test-deployment/metadata-flex.cfg
@@ -4,10 +4,4 @@
 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 ca24e04ad7..4b24812553 100644
--- a/.kokoro/appengine/test-deployment/metadata-standard.cfg
+++ b/.kokoro/appengine/test-deployment/metadata-standard.cfg
@@ -4,10 +4,4 @@
 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 4713ca6d95..57325f6ca6 100644
--- a/.kokoro/appengine/test-deployment/storage-flex.cfg
+++ b/.kokoro/appengine/test-deployment/storage-flex.cfg
@@ -4,10 +4,4 @@
 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 e0a3a62fd3..678b37a417 100644
--- a/.kokoro/appengine/test-deployment/storage-standard.cfg
+++ b/.kokoro/appengine/test-deployment/storage-standard.cfg
@@ -4,10 +4,4 @@
 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 5767a2c52c..2244d08e80 100755
--- a/.kokoro/build-with-appengine.sh
+++ b/.kokoro/build-with-appengine.sh
@@ -24,7 +24,7 @@ gcloud auth activate-service-account --key-file "$GOOGLE_APPLICATION_CREDENTIALS
 gcloud config set project $GCLOUD_PROJECT
 
 export NODE_ENV=development
-export GAE_VERSION=doc-sample-${PROJECT}-${APPENGINE_ENVIRONMENT}
+export GAE_VERSION=doc-sample-$(echo $PROJECT | sed 's_/_-_g')
 
 # Register post-test cleanup
 function cleanup {