diff --git a/synthtool/gcp/templates/java_library/.kokoro/nightly/integration.cfg b/synthtool/gcp/templates/java_library/.kokoro/nightly/integration.cfg
index ca0274800..40c4abb7b 100644
--- a/synthtool/gcp/templates/java_library/.kokoro/nightly/integration.cfg
+++ b/synthtool/gcp/templates/java_library/.kokoro/nightly/integration.cfg
@@ -10,20 +10,25 @@ env_vars: {
   key: "JOB_TYPE"
   value: "integration"
 }
-
+# TODO: remove this after we've migrated all tests and scripts
 env_vars: {
   key: "GCLOUD_PROJECT"
   value: "gcloud-devel"
 }
 
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
 env_vars: {
   key: "ENABLE_BUILD_COP"
   value: "true"
 }
 
 env_vars: {
-    key: "GOOGLE_APPLICATION_CREDENTIALS"
-    value: "keystore/73713_java_it_service_account"
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "keystore/73713_java_it_service_account"
 }
 
 before_action {
diff --git a/synthtool/gcp/templates/java_library/.kokoro/nightly/samples.cfg b/synthtool/gcp/templates/java_library/.kokoro/nightly/samples.cfg
index b4b051cd0..20aabd55d 100644
--- a/synthtool/gcp/templates/java_library/.kokoro/nightly/samples.cfg
+++ b/synthtool/gcp/templates/java_library/.kokoro/nightly/samples.cfg
@@ -11,9 +11,15 @@ env_vars: {
   value: "samples"
 }
 
+# TODO: remove this after we've migrated all tests and scripts
 env_vars: {
   key: "GCLOUD_PROJECT"
-  value: "gcloud-devel"
+  value: "java-docs-samples-testing"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "java-docs-samples-testing"
 }
 
 env_vars: {
diff --git a/synthtool/gcp/templates/java_library/.kokoro/presubmit/integration.cfg b/synthtool/gcp/templates/java_library/.kokoro/presubmit/integration.cfg
index 141f90c13..522e5b101 100644
--- a/synthtool/gcp/templates/java_library/.kokoro/presubmit/integration.cfg
+++ b/synthtool/gcp/templates/java_library/.kokoro/presubmit/integration.cfg
@@ -11,14 +11,20 @@ env_vars: {
   value: "integration"
 }
 
+# TODO: remove this after we've migrated all tests and scripts
 env_vars: {
-    key: "GCLOUD_PROJECT"
-    value: "gcloud-devel"
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
 }
 
 env_vars: {
-    key: "GOOGLE_APPLICATION_CREDENTIALS"
-    value: "keystore/73713_java_it_service_account"
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "keystore/73713_java_it_service_account"
 }
 
 before_action {
diff --git a/synthtool/gcp/templates/java_library/.kokoro/presubmit/samples.cfg b/synthtool/gcp/templates/java_library/.kokoro/presubmit/samples.cfg
index fa7b493d0..1171aead0 100644
--- a/synthtool/gcp/templates/java_library/.kokoro/presubmit/samples.cfg
+++ b/synthtool/gcp/templates/java_library/.kokoro/presubmit/samples.cfg
@@ -11,14 +11,20 @@ env_vars: {
   value: "samples"
 }
 
+# TODO: remove this after we've migrated all tests and scripts
 env_vars: {
-    key: "GCLOUD_PROJECT"
-    value: "gcloud-devel"
+  key: "GCLOUD_PROJECT"
+  value: "java-docs-samples-testing"
 }
 
 env_vars: {
-    key: "GOOGLE_APPLICATION_CREDENTIALS"
-    value: "keystore/73713_java_it_service_account"
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "java-docs-samples-testing"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "keystore/73713_java_it_service_account"
 }
 
 before_action {