diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index d7dbf59de..e1b04b4fd 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -76,8 +76,6 @@ integration)
       -DtrimStackTrace=false \
       -Dclirr.skip=true \
       -Denforcer.skip=true \
-      -Dspanner.testenv.instance=projects/span-cloud-testing/instances/java-client-integration-test \
-      -Dspanner.gce.config.project_id=span-cloud-testing \
       -fae \
       verify
     RETURN_CODE=$?
diff --git a/.kokoro/presubmit/integration.cfg b/.kokoro/presubmit/integration.cfg
index 929a8b346..5864c603e 100644
--- a/.kokoro/presubmit/integration.cfg
+++ b/.kokoro/presubmit/integration.cfg
@@ -11,13 +11,24 @@ env_vars: {
   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: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "secret_manager/java-client-testing"
+  value: "secret_manager/java-it-service-account"
 }
 
 env_vars: {
   key: "SECRET_MANAGER_KEYS"
-  value: "java-client-testing"
+  value: "java-it-service-account"
 }
 
diff --git a/src/test/java/com/google/cloud/spanner/jdbc/it/ITOpenTelemetryTest.java b/src/test/java/com/google/cloud/spanner/jdbc/it/ITOpenTelemetryTest.java
index 83cfab81c..7c5654fd7 100644
--- a/src/test/java/com/google/cloud/spanner/jdbc/it/ITOpenTelemetryTest.java
+++ b/src/test/java/com/google/cloud/spanner/jdbc/it/ITOpenTelemetryTest.java
@@ -23,6 +23,8 @@
 
 import com.google.api.gax.core.FixedCredentialsProvider;
 import com.google.api.gax.rpc.ResourceExhaustedException;
+import com.google.auth.Credentials;
+import com.google.auth.oauth2.GoogleCredentials;
 import com.google.cloud.opentelemetry.trace.TraceConfiguration;
 import com.google.cloud.opentelemetry.trace.TraceExporter;
 import com.google.cloud.spanner.Database;
@@ -282,14 +284,19 @@ private void assertUpdateResult(long updateCount, String sql)
   }
 
   private void assertTrace(String sql) throws IOException, InterruptedException {
+    Credentials credentials;
+    if (env.getTestHelper().getOptions().getCredentials() != null) {
+      credentials = env.getTestHelper().getOptions().getCredentials();
+    } else {
+      credentials = GoogleCredentials.getApplicationDefault();
+    }
+    if (credentials == null) {
+      throw new IllegalStateException("No credentials found");
+    }
     TraceServiceSettings settings =
-        env.getTestHelper().getOptions().getCredentials() == null
-            ? TraceServiceSettings.newBuilder().build()
-            : TraceServiceSettings.newBuilder()
-                .setCredentialsProvider(
-                    FixedCredentialsProvider.create(
-                        env.getTestHelper().getOptions().getCredentials()))
-                .build();
+        TraceServiceSettings.newBuilder()
+            .setCredentialsProvider(FixedCredentialsProvider.create(credentials))
+            .build();
     try (TraceServiceClient client = TraceServiceClient.create(settings)) {
       // It can take a few seconds before the trace is visible.
       Thread.sleep(5000L);