diff --git a/packages/google-devtools-cloudbuild/src/v1/cloud_build_client.ts b/packages/google-devtools-cloudbuild/src/v1/cloud_build_client.ts
index bc435fd4abc..662aeb8f1ac 100644
--- a/packages/google-devtools-cloudbuild/src/v1/cloud_build_client.ts
+++ b/packages/google-devtools-cloudbuild/src/v1/cloud_build_client.ts
@@ -140,6 +140,12 @@ export class CloudBuildClient {
     // Save the auth object to the client, for use by other methods.
     this.auth = this._gaxGrpc.auth as gax.GoogleAuth;
 
+    // Set useJWTAccessWithScope on the auth object.
+    this.auth.useJWTAccessWithScope = true;
+
+    // Set defaultServicePath on the auth object.
+    this.auth.defaultServicePath = staticMembers.servicePath;
+
     // Set the default scopes in auth client if needed.
     if (servicePath === staticMembers.servicePath) {
       this.auth.defaultScopes = staticMembers.scopes;
@@ -3555,6 +3561,7 @@ export class CloudBuildClient {
       return this.cloudBuildStub!.then(stub => {
         this._terminated = true;
         stub.close();
+        this.operationsClient.close();
       });
     }
     return Promise.resolve();